issue 1435 - Port popup.html from Chrome/Safari/Opera to Firefox

chrome/content/ui/ext/popup.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 (function()
 {
-  let {UI} = require("ui");
+  var {UI} = require("ui");
   
-  let iframe = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+  var iframe = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
     .getInterface(Components.interfaces.nsIWebNavigation)
     .QueryInterface(Components.interfaces.nsIDocShell)
     .chromeEventHandler;
-  let topWindow = iframe.ownerDocument.defaultView;
-  
+  var topWindow = iframe.ownerDocument.defaultView;
+  var panel = iframe.parentNode;
+
   // Firefox doesn't adjust the size of the popup automatically to the size
-  // of its content, like when the ad counter is expanded/collapsed.
-  let resizingScheduled = false;
+  // of its content, like when the ad counter is expanded/collapsed. So we use 
+  // MutationObserver to do so.
+  var resizingScheduled = false;
 
   function updateSize()
   {
     if (!resizingScheduled)
     {
       setTimeout(function()
       {
-        iframe.parentNode.sizeTo(document.body.scrollWidth, document.body.scrollHeight +11);
         resizingScheduled = false;
+
+        // We need to calculate the height difference because the panel's size includes 
+        // the height of the arrow image and the border width of the panel content
+        var heightDifference = panel.clientHeight - iframe.clientHeight;
+        panel.sizeTo(document.body.scrollWidth, document.body.scrollHeight + heightDifference);
       }, 0);
 
       resizingScheduled = true;
     }
   }
 
   window.addEventListener("load", function()
   {
     updateSize();
     new MutationObserver(updateSize).observe(document, {
       childList: true, attributes: true,
       characterData: true, subtree: true
     });
   });
 
   ext = {
     __proto__: ext,
     closePopup: function()
     {
-      iframe.parentNode.hidePopup();
+      panel.hidePopup();
     },
     openBlockable: function()

[Thomas Greiner, 2014/10/13 13:18:23]

This function is no longer used to only open the dialog but to toggle it which
should be reflected in the name (e.g. "toggleBlockable").

     {
-      if (!UI.isBottombarOpen(topWindow))
-      {
-        UI.toggleBottombar(topWindow);
-        ext.closePopup();
-      }
+      UI.toggleBottombar(topWindow);
+      ext.closePopup();
     },
-    showBlockable: function()
+    isBlockableOpen: function()
     {
-      return !UI.isBottombarOpen(topWindow);
+      return UI.isBottombarOpen(topWindow);
     },
     reportIssue: function()
     {
       UI.openReportDialog(topWindow);
     },
     showReportIssue: function()
     {
-      let location = UI.getCurrentLocation(topWindow);
+      var location = UI.getCurrentLocation(topWindow);
       return location && Policy.isBlockableScheme(location) && location.scheme != "mailto";
     }
   };
 })();