Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: lib/ui.js

Issue 5705421486555136: First run page and subscription on install fix (FF for android) (Closed)
Patch Set: Created April 25, 2014, 11:40 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld