| Index: lib/ui.js |
| =================================================================== |
| --- a/lib/ui.js |
| +++ b/lib/ui.js |
| @@ -154,17 +154,17 @@ let optionsObserver = |
| request.mozBackgroundRequest = true; |
| request.open("GET", "chrome://adblockplus/content/ui/subscriptions.xml"); |
| request.addEventListener("load", function() |
| { |
| if (onShutdown.done) |
| return; |
| let currentSubscription = FilterStorage.subscriptions.filter((subscription) => subscription instanceof DownloadableSubscription && |
| - subscription.url != Prefs.subscriptions_exceptionsurl && |
| + subscription.url != Prefs.subscriptions_exceptionsurl && |
| subscription.url != Prefs.subscriptions_antiadblockurl); |
| currentSubscription = (currentSubscription.length ? currentSubscription[0] : null); |
| let subscriptions =request.responseXML.getElementsByTagName("subscription"); |
| for (let i = 0; i < subscriptions.length; i++) |
| { |
| let item = subscriptions[i]; |
| let url = item.getAttribute("url"); |
| @@ -461,22 +461,22 @@ let UI = exports.UI = |
| let {WindowObserver} = require("windowObserver"); |
| new WindowObserver(this); |
| let {defaultToolbarPosition} = require("appSupport"); |
| if ("abp-toolbarbutton" in this.overlay && defaultToolbarPosition) |
| { |
| try |
| { |
| - ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null); |
| + ({CustomizableUI} = Cu.import("resource:///modules/CustomizableUI.jsm", null)); |
| } |
| catch (e) |
| { |
| // No built-in CustomizableUI API, use our own implementation. |
| - ({CustomizableUI}) = require("customizableUI"); |
| + ({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 |