Fix toolbar icon customization in Australis

lib/customizableUI.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 227 matching lines @@
       return null;
 
     let widget = window.document.getElementById(id);
     if (!widget)
       return null;
 
     let toolbar = getToolbar(widget);
     if (!toolbar)
       return null;
 
-    let items = toolbar.currentSet.split(",");
-    let index = items.indexOf(id);
-    if (index < 0)
-      return null;
-    else
-      return {area: toolbar.id, placement: index};

[Wladimir Palant, 2013/11/27 16:04:01]

Given that we don't use the placement parameter in the current iteration of this
code, returning {area: toolbar.id} and removing unnecessary code is probably
better.

-  },
-
-  addWidgetToArea: function(id, area, position)
-  {
+    return {area: toolbar.id};
+  },
+
+  addWidgetToArea: function(id)
+  {
+    // Note: the official API function also has area and position parameters.
+    // We ignore those here and simply restore the previous position instead.
     let widget = widgets.get(id);
     for (let window of UI.applicationWindows)
     {
       let toolbox = getToolbox(window, widget);
       if (!toolbox)
         continue;
 
       let position = toolbox.getAttribute(widget.positionAttribute);

[Wladimir Palant, 2013/11/27 16:04:01]

This masks a parameter. We should probably simply remove area and position
parameters in order to indicate that these are ignored.

       if (position)
         position = position.replace(/^hidden,/, "visible,");
       showWidget(toolbox, widget, position);
     }
   },
 
   removeWidgetFromArea: function(id)
   {
     let widget = widgets.get(id);
     for (let window of UI.applicationWindows)
@@ skipping 42 matching lines @@
     for (let [id, widget] of widgets)
     {
       let toolbox = getToolbox(window, widget);
       if (toolbox)
         toolbox.removeEventListener("aftercustomization", onToolbarCustomization, false);
 
       removeWidget(window, widget);
     }
   }
 });