issue #1155 - Don't allow displaying icon text with Australis theme

lib/main.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
@@ skipping 23 matching lines @@
   },
 
   removeFromWindow: function(window)
   {
     if (window.location.href != this.windowUrl)
       return;
     this._removeFromWindow(window);
   }
 }
 
+/**
+ * Object initializing add-on options, observes add-on manager notifications
+ * about add-on options being opened.
+ * @type nsIObserver
+ */
+let optionsObserver =
+{
+  init: function()
+  {
+    Services.obs.addObserver(this, "addon-options-displayed", true);
+    onShutdown.add(function()
+    {
+      Services.obs.removeObserver(this, "addon-options-displayed");
+    }.bind(this));
+  },
+
+  initOptionsDoc: function(/**Document*/ doc)
+  {
+    function hideElement(id, hide)
+    {
+      let element = doc.getElementById(id);
+      if (element)
+        element.collapsed = hide;
+    }

[Wladimir Palant, 2014/07/30 07:45:40]

No point to have a generic function here, we only have one element to hide. This
should do:

doc.getElementById("abpcustomization-icondisplay").collapsed = true;

Note that this is somewhat more complicated in Adblock Plus because different
options pages are possible there.

[saroyanm, 2014/07/30 09:18:32]

Will keep in mind.

+
+    try
+    {
+      let {CustomizableUI} = Cu.import("resource:///modules/CustomizableUI.jsm", null);
+      if (CustomizableUI)

[Wladimir Palant, 2014/07/30 07:45:40]

This check is pointless, if the module fails to load there will be an exception.

+        hideElement("abpcustomization-icondisplay", true);
+    } catch (e) {}
+  },
+
+  observe: function(subject, topic, data)
+  {
+    let {addonID} = require("info")
+    if (data != addonID)
+      return;
+
+    this.initOptionsDoc(subject.QueryInterface(Ci.nsIDOMDocument));
+  },
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference])

[Wladimir Palant, 2014/07/30 07:45:40]

Please import XPCOMUtils in this file. The fact that you can use XPCOMUtils from
bootstrap.js is a buildtools issue, `build.py build -m` will produce a build
with proper scope isolation.

[saroyanm, 2014/07/30 09:18:32]

Done.

+};
+optionsObserver.init();
+
 var VerticalPreferencesLayout =
 {
   __proto__: WindowFeature,
   windowUrl: "chrome://adblockplus/content/ui/filters.xul",
 
   _applyToWindow: function(window)
   {
     let content = window.document.getElementById("content");
     let splitter = window.document.getElementById("filtersSplitter");
     if (!content || !splitter)
@@ skipping 132 matching lines @@
     else
       enabled = Prefs[name];
 
     if (enabled)
       features[name].init();
     else
       features[name].shutdown();
   }
 }
 
-
 // Initialize features and make sure to update them on changes
 for (let feature in features)
   updateFeature(feature);
 
 Prefs.addListener(updateFeature);