fix(core): properly check if document is loaded, closes #2716 (#2900)

tauri-apps · Nov 16, 2021 · 000d126 · 000d126
1 parent 15164d9
commit 000d126
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.changes/fix-ready-check.md b/.changes/fix-ready-check.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Properly check if document is loaded before invoking commands.
diff --git a/core/tauri/scripts/core.js b/core/tauri/scripts/core.js
@@ -52,7 +52,7 @@
         return reject(new Error('Invalid argument type.'))
       }
 
-      if (window.__TAURI_POST_MESSAGE__) {
+      if (document.readyState === 'complete' || document.readyState === 'interactive') {
         window.__TAURI_POST_MESSAGE__(
           cmd, {
             ...args,

diff --git a/core/tauri/src/manager.rs b/core/tauri/src/manager.rs
@@ -509,7 +509,7 @@ impl<R: Runtime> WindowManager<R> {
       r#"
       {core_script}
       {event_initialization_script}
-      if (window.__TAURI_INVOKE__) {{
+      if (document.readyState === 'complete') {{
         window.__TAURI_INVOKE__("__initialized", {{ url: window.location.href }}, {key})
       }} else {{
         window.addEventListener('DOMContentLoaded', function () {{