Load settings before initializing the popup (#246)

browserpass · Apr 2, 2018 · 3043b5c · 3043b5c
1 parent 070971c
commit 3043b5c
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/chrome/script.browserify.js b/chrome/script.browserify.js
@@ -12,11 +12,16 @@ var error;
 var domain, urlDuringSearch;
 var searchSettings;
 
-m.mount(document.getElementById("mount"), { view: view, oncreate: oncreate });
+// load settings and initialise popup
+chrome.runtime.sendMessage({ action: "getSettings" }, function(settings) {
+    searchSettings = settings;
+
+    m.mount(document.getElementById("mount"), { view: view, oncreate: oncreate });
 
-chrome.tabs.onActivated.addListener(init);
-chrome.tabs.query({ lastFocusedWindow: true, active: true }, function(tabs) {
-  init(tabs[0]);
+    chrome.tabs.onActivated.addListener(init);
+    chrome.tabs.query({ lastFocusedWindow: true, active: true }, function(tabs) {
+        init(tabs[0]);
+    });
 });
 
 function view() {