script fixes

tauri-apps · Oct 3, 2023 · df01c3c · df01c3c
1 parent 6b47f48
commit df01c3c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/core/tauri/scripts/core.js b/core/tauri/scripts/core.js
@@ -9,7 +9,7 @@
 
   const osName = __TEMPLATE_os_name__
 
-  Object.defineProperties(window.__TAURI__.__INTERNALS__, 'convertFileSrc', {
+  Object.defineProperty(window.__TAURI__.__INTERNALS__, 'convertFileSrc', {
     value: function (filePath, protocol = 'asset') {
       const path = encodeURIComponent(filePath)
       return osName === 'windows' || osName === 'android'
@@ -18,7 +18,7 @@
     }
   })
 
-  Object.defineProperties(window.__TAURI__.__INTERNALS__, 'transformCallback', {
+  Object.defineProperty(window.__TAURI__.__INTERNALS__, 'transformCallback', {
     value: function transformCallback(callback, once) {
       var identifier = uid()
       var prop = `_${identifier}`
@@ -52,7 +52,7 @@
     }
   }
 
-  Object.defineProperties(window.__TAURI__.__INTERNALS__, 'invoke', {
+  Object.defineProperty(window.__TAURI__.__INTERNALS__, 'invoke', {
     value: function (cmd, payload = {}, options) {
       return new Promise(function (resolve, reject) {
         const callback = window.__TAURI__.__INTERNALS__.transformCallback(

diff --git a/core/tauri/scripts/init.js b/core/tauri/scripts/init.js
@@ -3,20 +3,6 @@
 // SPDX-License-Identifier: MIT
 
 ;(function () {
-  if (!window.__TAURI__) {
-    Object.defineProperty(window, '__TAURI__', {
-      value: {}
-    })
-  }
-
-  if (!window.__TAURI__.__INTERNALS__) {
-    Object.defineProperty(window.__TAURI__, '__INTERNALS__', {
-      value: {
-        plugins: {}
-      }
-    })
-  }
-
   __RAW_freeze_prototype__
 
   __RAW_pattern_script__

diff --git a/core/tauri/scripts/process-ipc-message-fn.js b/core/tauri/scripts/process-ipc-message-fn.js
@@ -4,7 +4,7 @@
 
 // this is a function and not an iife so use it carefully
 
-;(function (message) {
+(function (message) {
   if (
     message instanceof ArrayBuffer ||
     ArrayBuffer.isView(message) ||

diff --git a/core/tauri/src/manager.rs b/core/tauri/src/manager.rs
@@ -565,6 +565,23 @@ impl<R: Runtime> WindowManager<R> {
       window_labels.push(l);
     }
     webview_attributes = webview_attributes
+      .initialization_script(
+        r#"
+        if (!window.__TAURI__) {
+          Object.defineProperty(window, '__TAURI__', {
+            value: {}
+          })
+        }
+
+        if (!window.__TAURI__.__INTERNALS__) {
+          Object.defineProperty(window.__TAURI__, '__INTERNALS__', {
+            value: {
+              plugins: {}
+            }
+          })
+        }
+      "#,
+      )
       .initialization_script(&self.inner.invoke_initialization_script)
       .initialization_script(&format!(
         r#"