| Index: lib/ui.js |
| =================================================================== |
| --- a/lib/ui.js |
| +++ b/lib/ui.js |
| @@ -33,15 +33,6 @@ |
| 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()). |
| @@ -277,6 +268,16 @@ |
| */ |
| init: function() |
| { |
| + try |
| + { |
| + ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null); |
|
saroyanm
2014/04/25 12:08:06
Not sure if we need this here ?
|
| + } |
| + catch (e) |
| + { |
| + // No built-in CustomizableUI API, use our own implementation. |
| + ({CustomizableUI}) = require("customizableUI"); |
| + } |
|
Wladimir Palant
2014/04/25 12:39:54
This doesn't resolve the circular reference. The m
saroyanm
2014/04/25 14:04:22
Thanks for descriptive comment.
Done.
|
| + |
| // We should call initDone once both overlay and filters are loaded |
| let overlayLoaded = false; |
| let filtersLoaded = false; |