Fixed: Background color not restored when context menu clickhide canceled

include.postload.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 279 matching lines @@
     }
   }
   if(url) {
     clickHideFilters.push(relativeToAbsoluteUrl(url));
     selectorList.push(elt.localName + '[src="' + url + '"]');
   }
   
   // Show popup
   clickHide_showDialog(e.clientX, e.clientY, clickHideFilters);
 
+  // Set background color in case it got selected using context menu
+  if (typeof currentElement_backgroundColor == "undefined")

[Wladimir Palant, 2013/12/18 11:57:05]

Given that we never reset currentElement_backgroundColor, won't this fail if we
ever selected an element on this page?

I think that we should simply do this during clickhide-new-filter message
handling, unconditionally.

[Thomas Greiner, 2013/12/18 12:33:26]

Done.
http://codereview.adblockplus.org/5661044793933824/

+    currentElement_backgroundColor = currentElement.style.backgroundColor;
+
   // Highlight the unlucky elements
   // Restore currentElement's box-shadow and bgcolor so that highlightElements won't save those
   currentElement.style.setProperty("-webkit-box-shadow", currentElement_boxShadow);
   currentElement.style.backgroundColor = currentElement_backgroundColor;
   // Highlight the elements specified by selector in yellow
   highlightElements(selectorList.join(","));
   // Now, actually highlight the element the user clicked on in red
   currentElement.style.setProperty("-webkit-box-shadow", "inset 0px 0px 5px #fd1708");
   currentElement.style.backgroundColor = "#f6a1b5";
 }
@@ skipping 249 matching lines @@
 
           clickHide_deactivate();
         }
         break;
       default:
         sendResponse({});
         break;
     }
   });
 }