Issue 2080 - Removed duplicated code from clickHide_deactivate

include.postload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 253 matching lines @@
   document.documentElement.appendChild(overlay);
   return overlay;
 }
 
 // Show dialog asking user whether she wants to add the proposed filters derived
 // from selected page element
 function clickHide_showDialog(left, top, filters)
 {
   // 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;
 
   clickHideFiltersDialog = document.createElement("iframe");
   clickHideFiltersDialog.src = ext.getURL("block.html");
   clickHideFiltersDialog.setAttribute("style", "position: fixed !important; visibility: hidden; display: block !important; border: 0px !important;");
   clickHideFiltersDialog.style.WebkitBoxShadow = "5px 5px 20px rgba(0,0,0,0.5)";
   clickHideFiltersDialog.style.zIndex = 0x7FFFFFFF;
 
   // Position in upper-left all the time
@@ skipping 55 matching lines @@
   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);
 }
 
-// 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)
 {
   e.stopPropagation();
 }
 
 function clickHide_elementClickHandler(e) {
   e.preventDefault();
   e.stopPropagation();
@@ skipping 316 matching lines @@
           lastRightClickEventValid = false;
         else
           lastRightClickEvent = null;
         break;
     }
   });
 
   if (window == window.top)
     ext.backgroundPage.sendMessage({type: "report-html-page"});
 }