Handle wrong content script order

For #273

Author: kkapsner

lib/main.js

@@ -95,24 +95,28 @@
 					allFrames: true,
 					runAt: "document_start",
 					js: [{
-						code: `(function(){
+						code: `(function(settingsData){
 							if (typeof require !== "undefined"){
 								const settings = require("./settings");
 								const logging = require("./logging");
-								if (settings.init(${JSON.stringify(data)})){
+								if (settings.init(settingsData)){
 									logging.message("Initialized settings by dynamic content script.");
 								}
 								else {
 									logging.error("Dynamic content script was too late to provide settings.");
 								}
 							}
 							else {
-								console.error(
-									"[CanvasBlocker] invalid content scripts: require not defined at",
+								if (!window.scope){
+									window.scope = {};
+								}
+								window.scope.settingsData = settingsData;
+								console.warn(
+									"[CanvasBlocker] invalid content script order: require not defined at",
 									window.location.href
 								);
 							}
-						}())`
+						}(${JSON.stringify(data)}))`
 					}]
 				}).then(function(api){
 					logging.verbose("Content script registered.");

lib/require.js

@@ -4,7 +4,9 @@
 
 const require = function(){
 	"use strict";
-	window.scope = {};
+	if (!window.scope){
+		window.scope = {};
+	}
 	const scope = window.scope;
 
 	function getScopeName(module){

lib/settings.js

@@ -415,7 +415,13 @@
 		initEvents.forEach(function(callback){callback();});
 		return true;
 	};
-	scope.loaded = browser.storage.local.get().then(scope.init);
+	if (window.scope.settingsData){
+		scope.init(window.scope.settingsData);
+		scope.loaded = Promise.resolve(false);
+	}
+	else {
+		scope.loaded = browser.storage.local.get().then(scope.init);
+	}
 	scope.onloaded = function(callback){
 		if (scope.isStillDefault){
 			initEvents.push(callback);