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

lib/ui.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
@@ skipping 16 matching lines @@
 let {Filter} = require("filterClasses");
 let {Subscription, SpecialSubscription, DownloadableSubscription} = require("subscriptionClasses");
 let {Synchronizer} = require("synchronizer");
 let {KeySelector} = require("keySelector");
 let {Notification} = require("notification");
 let {initAntiAdblockNotification} = require("antiadblockInit");
 
 let CustomizableUI = null;
 
 /**
- * Filter corresponding with "disable on site" menu item (set in fillIconMent()).
+ * Filter corresponding with "disable on site" menu item (set in fillIconMenu()).
  * @type Filter
  */
 let siteWhitelist = null;
 /**
  * Filter corresponding with "disable on site" menu item (set in fillIconMenu()).
  * @type Filter
  */
 let pageWhitelist = null;
 
 /**
@@ skipping 332 matching lines @@
 
     if ("abp-status-popup" in this.overlay)
     {
       let menuSource = this.overlay["abp-status-popup"];
       delete this.overlay["abp-status-popup"];
 
       if (this.overlay.all.length)
         this.overlay.all[0].appendChild(menuSource);
       if ("abp-toolbarbutton" in this.overlay)
         this.overlay["abp-toolbarbutton"].appendChild(fixId(menuSource.cloneNode(true), "abp-toolbar"));
-      if ("abp-menuitem" in this.overlay)
-        this.overlay["abp-menuitem"].appendChild(fixId(menuSource.cloneNode(true), "abp-menuitem"));
     }
   },
 
   /**
    * Gets called once the initialization is finished and Adblock Plus elements
    * can be added to the UI.
    */
   initDone: function()
   {
     // The icon might be added already, make sure its state is correct
@@ skipping 154 matching lines @@
 
     // Attach event handlers
     for (let i = 0; i < eventHandlers.length; i++)
     {
       let [id, event, handler] = eventHandlers[i];
       let element = window.document.getElementById(id);
       if (element)
         element.addEventListener(event, handler.bind(null, window), false);
     }
     window.addEventListener("popupshowing", this.onPopupShowing, false);
+    window.addEventListener("popuphiding", this.onPopupHiding, false);
     window.addEventListener("keypress", this.onKeyPress, false);
 
     addBrowserLocationListener(window, function()
     {
       this.updateIconState(window, window.document.getElementById("abp-status"));
       this.updateIconState(window, window.document.getElementById("abp-toolbarbutton"));
     }.bind(this));
     addBrowserClickListener(window, this.onBrowserClick.bind(this, window));
 
     window.document.getElementById("abp-notification-close").addEventListener("command", function(event)
@@ skipping 43 matching lines @@
       }
       else
       {
         let clone = window.document.getElementById(id);
         if (clone)
           clone.parentNode.removeChild(clone);
       }
     }
 
     window.removeEventListener("popupshowing", this.onPopupShowing, false);
+    window.removeEventListener("popuphiding", this.onPopupHiding, false);
     window.removeEventListener("keypress", this.onKeyPress, false);
     removeBrowserLocationListeners(window);
     removeBrowserClickListeners(window);
   },
 
   /**
    * The overlay information to be used when adding elements to the UI.
    * @type Object
    */
   overlay: null,
@@ skipping 644 matching lines @@
     let {contentContextMenu} = require("appSupport");
     if ((typeof contentContextMenu == "string" && popup.id == contentContextMenu) ||
         (contentContextMenu instanceof Array && contentContextMenu.indexOf(popup.id) >= 0))
     {
       this.fillContentContextMenu(popup);
     }
     else if (popup.id == "abp-tooltip")
       this.fillIconTooltip(event, popup.ownerDocument.defaultView);
     else
     {
-      let match = /^(abp-(?:toolbar|status|menuitem)-)popup$/.exec(popup.id);
+      let match = /^(abp-(toolbar|status|menuitem)-)popup$/.exec(popup.id);
       if (match)
-        this.fillIconMenu(event, popup.ownerDocument.defaultView, match[1]);
+      {

[Thomas Greiner, 2014/09/29 16:19:49]

What about adding the following line to avoid accessing match[1] and match[2]:

`let [, prefix, name] = match;`

[saroyanm, 2014/10/02 07:53:56]

I like it.
Done.

+        if (match[2] == "toolbar" || match[2] == "status")
+        {
+          let window = popup.ownerDocument.defaultView;
+          let browser = window.document.getElementById(match[1] + "popup-browser");
+          browser.setAttribute("src", "chrome://adblockplus/content/ui/popup.html");
+        }
+        else
+          this.fillIconMenu(event, popup.ownerDocument.defaultView, match[1]);
+      }
     }
   },
 
+   /**
+   * Called when some pop-up in the application window is being hidden
+   */
+  onPopupHiding: function(/**Event*/ event)
+  {
+    if (event.defaultPrevented)
+      return;
+
+    let popup = event.originalTarget;
+    if (popup.id == "abp-toolbar-popup")
+    {
+      let window = popup.ownerDocument.defaultView;
+      let browser = window.document.getElementById("abp-toolbar-popup-browser");
+      browser.setAttribute("src", "about:blank");
+    }
+  },
+
   /**
    * Handles click on toolbar and status bar icons.
    */
   onIconClick: function(/**Event*/ event)
   {
     if (event.eventPhase != event.AT_TARGET)
       return;
 
     let isToolbar = (event.target.localName != "statusbarpanel");
     let action = 0;
@@ skipping 609 matching lines @@
       window.document.getElementById("abp-notification-yes").onclick = buttonHandler.bind(null, true);
       window.document.getElementById("abp-notification-no").onclick = buttonHandler.bind(null, false);
     }
 
     panel.setAttribute("class", "abp-" + notification.type);
     panel.setAttribute("noautohide", notification.type === "question");
     panel.openPopup(button, "bottomcenter topcenter", 0, 0, false, false, null);
   }
 };
 UI.onPopupShowing = UI.onPopupShowing.bind(UI);
+UI.onPopupHiding = UI.onPopupHiding.bind(UI);
 UI.onKeyPress = UI.onKeyPress.bind(UI);
 UI.onIconClick = UI.onIconClick.bind(UI);
 UI.init();
 
 /**
  * List of event handers to be registered for each window. For each event
  * handler the element ID, event and the actual event handler are listed.
  * @type Array
  */
 let eventHandlers = [
@@ skipping 12 matching lines @@
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });