Merge branch 'jb53914' into 'master'

[embedlite-components] Listen embedui:runjavascript and reply with... See merge request mer-core/embedlite-components!121
sailfishos · Apr 20, 2021 · 99f964d · 99f964d
2 parents 5439bb3 + 9021cd0
commit 99f964d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/jsscripts/embedhelper.js b/jsscripts/embedhelper.js
@@ -69,6 +69,7 @@ EmbedHelper.prototype = {
     // Metrics used when virtual keyboard is open/opening.
     addMessageListener("embedui:vkbOpenCompositionMetrics", this);
     addMessageListener("embedui:addhistory", this);
+    addMessageListener("embedui:runjavascript", this);
     addMessageListener("Memory:Dump", this);
     addMessageListener("Gesture:ContextMenuSynth", this);
     addMessageListener("embed:ContextMenuCreate", this);
@@ -372,6 +373,41 @@ EmbedHelper.prototype = {
         docShell.setCurrentURI(initialURI);
         break;
       }
+      case "embedui:runjavascript": {
+        if (aMessage.data && aMessage.data.script) {
+          let callbackId = aMessage.data.callbackId;
+          let jsstring = aMessage.data.script;
+
+          let promise = new Promise(function(resolve, reject) {
+            try {
+              let f = new content.Function(jsstring);
+              let result = f();
+              resolve(result);
+            } catch (e) {
+              reject(e.toString());
+            }
+          }).then(result => {
+                    if (callbackId >= 0) {
+                      let error
+                      sendAsyncMessage("embed:runjavascript", {
+                                         "result": result,
+                                         "error": error,
+                                         "callbackId": callbackId
+                                       });
+                    }
+          }).catch(error => {
+                     let result
+                     sendAsyncMessage("embed:runjavascript", {
+                                        "result": result,
+                                        "error": error,
+                                        "callbackId": callbackId
+                                      });
+                   });
+        }
+
+        break;
+      }
+
       case "Memory:Dump": {
         if (aMessage.data && aMessage.data.fileName) {
             let memDumper = Cc["@mozilla.org/memory-info-dumper;1"].getService(Ci.nsIMemoryInfoDumper);

diff --git a/rpm/embedlite-components-qt5.spec b/rpm/embedlite-components-qt5.spec
@@ -18,7 +18,7 @@
 
 Name:       embedlite-components-qt5
 Summary:    EmbedLite components Qt5
-Version:    1.19.29
+Version:    1.22.27
 Release:    1
 License:    MPLv2.0
 URL:        https://git.sailfishos.org/mer-core/embedlite-components