ensures trigger after appReady

mi-g · mi-g · commit e34eb35d0141 · 2018-03-27T13:33:31.000+02:00
diff --git a/src/weh-content.js b/src/weh-content.js
@@ -49,7 +49,6 @@ port.onMessage.addListener((message) => {
 weh.rpc.call("appStarted", {
 		uiName: weh.uiName,
 		usePrefs: usePrefs
-	}).then(function () {
 	}).catch(function (err) {
 		console.info("appStarted failed", err);
 	});
@@ -108,11 +107,36 @@ Promise.all(readyPromises)
 		return weh.rpc.call("appReady",{
 			uiName: weh.uiName
 		});
+	}).then(function () {
+		if(triggerRequested) {
+			let result = triggerArgs;
+			triggerArgs = undefined;
+			triggerRequested = false;
+			weh.doTrigger(result);
+		}
 	})
 	.catch((err)=>{
 		console.error("app not ready:",err);
 	});
 
+var triggerRequested = false;
+var triggerArgs = undefined;
+var appStarted = false;
+
+weh.doTrigger = function (result) {
+	return weh.rpc.call("trigger",weh.uiName,result)
+		.catch(()=>{});
+}
+	
+weh.trigger = function (result) {
+	if(appStarted)
+		return weh.doTrigger(result);
+	else {
+		triggerArgs = result;
+		triggerRequested = true;
+	}
+}
+
 /* setting up translation */
 weh._ = require("weh-i18n").getMessage;
 
@@ -135,9 +159,4 @@ weh.setPageTitle = function (title) {
 	titleElement.appendChild(document.createTextNode(title));
 };
 
-weh.trigger = function (result) {
-	return weh.rpc.call("trigger",weh.uiName,result)
-		.catch(()=>{});
-}
-
 module.exports = weh;
