@wailsio/runtime 3.0.0-alpha.10 → 3.0.0-alpha.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wailsio/runtime",
-  "version": "3.0.0-alpha.10",
+  "version": "3.0.0-alpha.11",
   "description": "Wails Runtime",
   "main": "src/index.js",
   "types": "types/index.d.ts",

package/src/index.js

@@ -10,7 +10,6 @@ The electron alternative for Go
 
 import {setupContextMenus} from "./contextmenu";
 import {setupDrag} from "./drag";
-import {reloadWML} from "./wml";
 import {Emit, Off, OffAll, On, Once, OnMultiple, WailsEvent} from './events';
 import {ByID, ByName, Plugin} from "./calls";
 import {Error, Info, OpenFile, Question, SaveFile, Warning} from "./dialogs";
@@ -24,8 +23,9 @@ import * as Runtime from "./runtime";
 import * as Screens from "./screens";
 import * as System from "./system";
 import * as Window from "./window";
+import * as WML from './wml';
 
-export { Application, Browser, Clipboard, ContextMenu, Flags, Runtime, Screens, System, Window };
+export { Application, Browser, Clipboard, ContextMenu, Flags, Runtime, Screens, System, Window, WML };
 
 export const Events = {
     On,
@@ -50,9 +50,52 @@ export const Dialogs = {
     OpenFile, Question, Warning, SaveFile
 }
 
-setupContextMenus();
-setupDrag();
+/***
+ This technique for proper load detection is taken from HTMX:
 
-document.addEventListener("DOMContentLoaded", function () {
-    reloadWML();
+ BSD 2-Clause License
+
+ Copyright (c) 2020, Big Sky Software
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ***/
+
+let isReady = false
+document.addEventListener('DOMContentLoaded', function() {
+    isReady = true
+})
+
+function whenReady(fn) {
+    if (isReady || document.readyState === 'complete') {
+        fn();
+    } else {
+        document.addEventListener('DOMContentLoaded', fn);
+    }
+}
+
+whenReady(() => {
+    setupContextMenus();
+    setupDrag();
+    WML.Reload();
 });

package/src/wml.js

@@ -143,7 +143,7 @@ function addWMLOpenBrowserListener() {
  *
  * @return {void}
  */
-export function reloadWML() {
+export function Reload() {
     console.log("Reloading WML");
     addWMLEventListeners();
     addWMLWindowListeners();