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 360 matching lines @@
     {
       if (element.hasAttribute("id"))
         element.setAttribute("id", element.getAttribute("id").replace("abp-status", newId));
 
       for (let i = 0, len = element.children.length; i < len; i++)
         fixId(element.children[i], newId);
 
       return element;
     }
 
     if ("abp-status-popup" in this.overlay)

[Thomas Greiner, 2014/10/17 15:02:21]

This whole block appears to be have been overlooked. Keep in mind that the menu
items are no longer found in "abp-status-popup".

[saroyanm, 2014/10/21 13:39:21]

Thomas I didn't left comment in this block as we discussed via IRC because I've
double checked and this block will be changed with next tasks when we will
implement badge functionality and change the way how toolbarbutton works now. So
we will only add bubble UI panel to toolbarbutton in future.

     {
       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"));
     }
   },
@@ skipping 895 matching lines @@
       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);
       if (match)
       {
         let [, prefix, name] = match;
+        let window = popup.ownerDocument.defaultView;
         if (name == "toolbar" || name == "status")
         {
-          let window = popup.ownerDocument.defaultView;
           let browser = window.document.getElementById(prefix + "popup-browser");
           browser.setAttribute("src", "chrome://adblockplus/content/ui/popup.html");
         }
         else
-          this.fillIconMenu(event, popup.ownerDocument.defaultView, match[1]);

[Thomas Greiner, 2014/10/17 15:02:21]

You're still using `match[1]` here instead of `prefix`.

[saroyanm, 2014/10/21 13:39:21]

Oops.

+          this.fillIconMenu(event, window, prefix);
       }
     }
   },
 
    /**
    * Called when some pop-up in the application window is being hidden
    */
   onPopupHiding: function(/**Event*/ event)
   {
     if (event.defaultPrevented)
@@ skipping 663 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);
 });