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 1274 matching lines @@
         (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);
       if (match)
       {

[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 [, prefix, name] = match;
+        let window = popup.ownerDocument.defaultView;
+        if (name == "toolbar" || name == "status")
         {
-          let window = popup.ownerDocument.defaultView;
-          let browser = window.document.getElementById(match[1] + "popup-browser");
+          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]);
+          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);
 });