First run page and subscription on install fix (FF for android)

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 15 matching lines @@
 let {FilterNotifier} = require("filterNotifier");
 let {RequestNotifier} = require("requestNotifier");
 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;
-try
-{
-  ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null);
-}
-catch (e)
-{
-  // No built-in CustomizableUI API, use our own implementation.
-  ({CustomizableUI}) = require("customizableUI");
-}
 
 /**
  * Filter corresponding with "disable on site" menu item (set in fillIconMent()).
  * @type Filter
  */
 let siteWhitelist = null;
 /**
  * Filter corresponding with "disable on site" menu item (set in fillIconMenu()).
  * @type Filter
  */
@@ skipping 86 matching lines @@
       {
         this.value = UI.toggleAcceptableAds();
       });
 
       setChecked("adblockplus-sync", syncEngine && syncEngine.enabled);
       addCommandHandler("adblockplus-sync", function()
       {
         this.value = UI.toggleSync();
       });
 
-      setChecked("adblockplus-showintoolbar", UI.isToolbarIconVisible());
-      addCommandHandler("adblockplus-showintoolbar", function()
+      if (hasToolbar)
       {
-        UI.toggleToolbarIcon();
-        this.value = UI.isToolbarIconVisible();
-      });
+        setChecked("adblockplus-showintoolbar", UI.isToolbarIconVisible());
+        addCommandHandler("adblockplus-showintoolbar", function()
+        {
+          UI.toggleToolbarIcon();
+          this.value = UI.isToolbarIconVisible();
+        });
+      }

[Wladimir Palant, 2014/04/25 14:32:19]

Same change would have to be done in fillIconMenu() as well. IMHO it is safer to
change isToolbarIconVisible() and toggleToolbarIcon() to check whether
CustomizableUI is set - that way future introducing new callers to these
functions won't break for non-obvious reasons.

[saroyanm, 2014/04/25 15:10:22]

Good point, thanks.

 
       let list = doc.getElementById("adblockplus-subscription-list");
       if (list)
       {
         // Load subscriptions data
         let request = new XMLHttpRequest();
         request.mozBackgroundRequest = true;
         request.open("GET", "chrome://adblockplus/content/ui/subscriptions.xml");
         request.addEventListener("load", function()
         {
@@ skipping 238 matching lines @@
    */
   initDone: function()
   {
     let {WindowObserver} = require("windowObserver");
     new WindowObserver(this);
 
     // Add toolbar icon
     let {defaultToolbarPosition} = require("appSupport");
     if ("abp-toolbarbutton" in this.overlay && defaultToolbarPosition)
     {
+      try
+      {
+        ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null);
+      }
+      catch (e)
+      {
+        // No built-in CustomizableUI API, use our own implementation.
+        ({CustomizableUI}) = require("customizableUI");
+      }
+      
       CustomizableUI.createWidget({
         id: "abp-toolbarbutton",
         type: "custom",
         positionAttribute: "abp-iconposition",        // For emulation only
         defaultArea: defaultToolbarPosition.parent,
         defaultBefore: defaultToolbarPosition.before, // For emulation only
         defaultAfter: defaultToolbarPosition.after,   // For emulation only
         removable: true,
         onBuild: function(document)
         {
@@ skipping 1487 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);
 });