Issue 2080 - Removed duplicated code from clickHide_deactivate

include.postload.js

Index: include.postload.js
===================================================================
--- a/include.postload.js
+++ b/include.postload.js
@@ -271,7 +271,7 @@
 {
   // If we are already selecting, abort now
   if (clickHide_activated || clickHideFiltersDialog)
-    clickHide_deactivate(true);
+    clickHide_rulesPending();

[Wladimir Palant, 2015/03/04 12:47:16]

What if we go here because clickHideFiltersDialog is set?
clickHide_rulesPending() won't remove the existing dialog. We either need to
handle that case separately or stop checking for clickHideFiltersDialog if it
simply cannot be set here.

[Sebastian Noack, 2015/03/04 13:36:38]

You are right, checking for clickHideFiltersDialog is unneeded. This function
must not be called when there is already a dialog. Calling
clickHide_rulesPending() prevents that by removing the event listeners. However,
the check where also unneeded before this change. But it's probably a good time
to get rid of it.

 
   clickHide_filters = filters;
 
@@ -347,47 +347,32 @@
   document.removeEventListener("keydown", clickHide_keyDown, true);
 }
 
-// Turn off click-to-hide
-function clickHide_deactivate(keepOverlays)
+function clickHide_deactivate()
 {
+  clickHide_rulesPending();
+
   if (clickHideFiltersDialog)
   {
     document.documentElement.removeChild(clickHideFiltersDialog);
     clickHideFiltersDialog = null;
   }
 
-  clickHide_activated = false;
   clickHide_filters = null;
-  if(!document)
-    return; // This can happen inside a nuked iframe...I think
+  lastRightClickEvent = null;
 
-  document.removeEventListener("mousedown", clickHide_stopPropagation, true);
-  document.removeEventListener("mouseup", clickHide_stopPropagation, true);
-  document.removeEventListener("mouseenter", clickHide_stopPropagation, true);
-  document.removeEventListener("mouseleave", clickHide_stopPropagation, true);
-  document.removeEventListener("mouseover", clickHide_mouseOver, true);
-  document.removeEventListener("mouseout", clickHide_mouseOut, true);
-  document.removeEventListener("click", clickHide_mouseClick, true);
-  document.removeEventListener("keydown", clickHide_keyDown, true);
+  if (currentElement) {

[Wladimir Palant, 2015/03/04 12:47:16]

Nit: Opening bracket should go on the next line, we should fix it if we touch
that code.

[Sebastian Noack, 2015/03/04 13:36:38]

Done.

+    currentElement.removeEventListener("contextmenu",  clickHide_elementClickHandler, true);
+    unhighlightElements();
+    unhighlightElement(currentElement);
+    currentElement = null;
+  }
+  unhighlightElements();
 
-  if (keepOverlays !== true)
-  {
-    lastRightClickEvent = null;
+  var overlays = document.getElementsByClassName("__adblockplus__overlay");
+  while (overlays.length > 0)
+    overlays[0].parentNode.removeChild(overlays[0]);
 
-    if (currentElement) {
-      currentElement.removeEventListener("contextmenu",  clickHide_elementClickHandler, true);
-      unhighlightElements();
-      unhighlightElement(currentElement);
-      currentElement = null;
-    }
-    unhighlightElements();
-
-    var overlays = document.getElementsByClassName("__adblockplus__overlay");
-    while (overlays.length > 0)
-      overlays[0].parentNode.removeChild(overlays[0]);
-
-    ext.onExtensionUnloaded.removeListener(clickHide_deactivate);
-  }
+  ext.onExtensionUnloaded.removeListener(clickHide_deactivate);
 }
 
 function clickHide_stopPropagation(e)