@saltcorn/mobile-app 0.9.0-beta.8 → 0.9.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "0.9.0-beta.8",
+  "version": "0.9.0",
   "description": "Apache Cordova application with @saltcorn/markup",
   "main": "index.js",
   "scripts": {

package/www/js/utils/global_utils.js

@@ -168,6 +168,8 @@ function addScriptToIframeHead(iframeDoc, script) {
 async function replaceIframeInnerContent(content) {
   const iframe = document.getElementById("content-iframe");
   const iframeDocument = iframe.contentWindow.document;
+  const modal = iframeDocument.getElementById("scmodal");
+  if (modal) modal.remove();
   const innerContentDiv = iframeDocument.getElementById("page-inner-content");
   innerContentDiv.innerHTML = content;
   const scripts = innerContentDiv.getElementsByTagName("script");
@@ -290,22 +292,37 @@ async function reload() {
 async function goBack(steps = 1, exitOnFirstPage = false) {
   const { inLoadState } = saltcorn.data.state.getState().mobileConfig;
   if (inLoadState) return;
+  const iframe = document.getElementById("content-iframe");
   if (
     routingHistory.length === 0 ||
     (exitOnFirstPage && routingHistory.length === 1)
   ) {
     navigator.app.exitApp();
   } else if (routingHistory.length <= steps) {
-    routingHistory = [];
-    await handleRoute("/");
+    try {
+      if (iframe?.contentWindow?.showLoadSpinner)
+        iframe.contentWindow.showLoadSpinner();
+      routingHistory = [];
+      await handleRoute("/");
+    } finally {
+      if (iframe?.contentWindow?.removeLoadSpinner)
+        iframe.contentWindow.removeLoadSpinner();
+    }
   } else {
-    routingHistory = routingHistory.slice(0, routingHistory.length - steps);
-    // don't repeat a post
-    if (routingHistory[routingHistory.length - 1].route.startsWith("post/")) {
-      routingHistory.pop();
+    try {
+      if (iframe?.contentWindow?.showLoadSpinner)
+        iframe.contentWindow.showLoadSpinner();
+      routingHistory = routingHistory.slice(0, routingHistory.length - steps);
+      // don't repeat a post
+      if (routingHistory[routingHistory.length - 1].route.startsWith("post/")) {
+        routingHistory.pop();
+      }
+      const newCurrent = routingHistory.pop();
+      await handleRoute(newCurrent.route, newCurrent.query);
+    } finally {
+      if (iframe?.contentWindow?.removeLoadSpinner)
+        iframe.contentWindow.removeLoadSpinner();
     }
-    const newCurrent = routingHistory.pop();
-    await handleRoute(newCurrent.route, newCurrent.query);
   }
 }