Fixed JS part for Edge.

Revertron · May 7, 2021 · 8c2e89d · 8c2e89d
1 parent 01e97ed
commit 8c2e89d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -72,5 +72,5 @@ FileDescription="Alternative Free Identity System"
 
 [features]
 webgui = ["web-view", "tinyfiledialogs", "open"]
-edge = ["web-view/edge"]
+edge = ["webgui", "web-view/edge"]
 default = ["webgui"]
diff --git a/src/web_ui.rs b/src/web_ui.rs
@@ -180,6 +180,7 @@ fn action_load_key(context: &Arc<Mutex<Context>>, web_view: &mut WebView<()>) {
 }
 
 fn action_loaded(context: &Arc<Mutex<Context>>, web_view: &mut WebView<()>) {
+    info!("Interface loaded");
     web_view.eval("showMiningIndicator(false, false);").expect("Error evaluating!");
     let handle: Handle<()> = web_view.handle();
     let threads = context.lock().unwrap().settings.mining.threads;

diff --git a/src/webview/scripts.js b/src/webview/scripts.js
@@ -183,7 +183,13 @@ function editDomain(domain, event) {
 function onLoad() {
     // Workaround for Arch Linux Webkit
     // https://github.com/Boscop/web-view/issues/212#issuecomment-671055663
-    window.external={invoke:function(x){window.webkit.messageHandlers.external.postMessage(x);}};
+    if (typeof window.external == 'undefined' || typeof window.external.invoke == 'undefined') {
+        window.external = {
+            invoke: function(x) {
+                window.webkit.messageHandlers.external.postMessage(x);
+            }
+        };
+    }
 
     external.invoke(JSON.stringify({cmd: 'loaded'}));
 }