update für Laptop

src/js/init.js

@@ -29,11 +29,11 @@ import {CreditsSite} from "../module/Application/pwa/js/site/CreditsSite";
 import {SelectWordsSite} from "../module/Application/pwa/js/site/SelectWordsSite";
 import {DeleteWordsSite} from "../module/Application/pwa/js/site/DeleteWordsSite";
 
+import './settings'
+
 applyPolyfills();
 
 
-import './settings'
-
 ThemeManager.addTheme(new Theme('red', 'red'));
 ThemeManager.addTheme(new Theme("blue", "blue"));
 ThemeManager.addTheme(new Theme("black", "black"));
@@ -55,10 +55,6 @@ AndroidBridge.addDefinition(() => {
     // window["app"]["refreshCurrentSite"] = app.refreshCurrentSite;
 });
 
-// bridge für Android
-// window["Translator"] = Translator;
-// window["Translator"]["setLanguage"] = Translator.setLanguage;
-
 
 SettingsSite.setTemplate("html/application/setting-template.html");
 // SettingsSite.shouldAddSettingsAction = false;
@@ -78,7 +74,6 @@ InitPromise.resolve(app).then(async function(){
     Translator.setLanguage("de");
 
     InstallManager.setCanInstallListener(e => {
-        console.log("can install!", e);
     });
 
     window["applyAndroidBridge"] = AndroidBridge.applyDefinitions;

src/js/lib/pwa-lib.js

@@ -38,11 +38,11 @@ class AndroidBridge {
                     object = newObject;
                 }
                 definition = parts[0];
-                console.log("parts for", definition, parts, object);
+                // console.log("parts for", definition, parts, object);
             }
             let textDefinition = definition;
             definition = () => {
-                console.log("defining", textDefinition, object);
+                // console.log("defining", textDefinition, object);
                 window[textDefinition] = object;
             };
         }
@@ -3500,6 +3500,7 @@ class MyDb {
         let self = this;
         return new Promise(function (resolve) {
             self.openStore(objectStore, function (store) {
+                console.log("loadMany 1");
                 let indexRequest = store.index(index);
                 indexRequest.onerror = function (e) {
                     throw {
@@ -3507,16 +3508,14 @@ class MyDb {
                         "event": e
                     }
                 };
-                let request = indexRequest.openCursor(value, direction);
-                request.onerror = function (e) {
-                    throw {
-                        "type": "indexed-db-index-error",
-                        "event": e
-                    }
-                };
+
                 let objects = [];
                 let numberResults = 0;
-                request.onsuccess = function (e) {
+                console.log("indexrequest", indexRequest.openCursor());
+                let request = indexRequest.openCursor(value, direction);
+                console.log("request", request);
+                request["onsuccess"]= function (e) {
+                    console.log("loadMany 2");
                     let cursor = e.target.result;
                     if (cursor) {
                         objects.push(cursor.value);
@@ -3526,8 +3525,16 @@ class MyDb {
                             return;
                         }
                     }
+                    console.log("loadMany 3");
                     resolve(objects);
                 };
+
+                request["onerror"] = function (e) {
+                    throw {
+                        "type": "indexed-db-index-error",
+                        "event": e
+                    }
+                };
             });
         });
     }

src/js/settings.js

@@ -1,9 +1,8 @@
 import {SystemSettings, Translator} from "./lib/pwa-lib";
 import {Matomo} from "./lib/pwa-assets";
 
-
 let basePath = "/pwa/wordRotator/public/";
-if (window.location.pathname.includes("publicTest/"))
+if (window.location.pathname.indexOf("publicTest/") >= 0)
 {
     basePath = "/pwa/wordRotator/publicTest/";
 }

src/module/Application/pwa/js/WordRotatorDb.js

@@ -39,7 +39,10 @@ export class WordRotatorDb extends MyDb {
     }
 
     async loadNextLevel(rendererTypes) {
+        console.log("loadNextLevel 1", IDBKeyRange.lowerBound(0));
         const levels = await this.loadMany("difficulty", IDBKeyRange.lowerBound(0), WordRotatorDb.OBJECT_STORE.LEVEL);
+        // const levels = await this.loadMany("difficulty", null, WordRotatorDb.OBJECT_STORE.LEVEL);
+        console.log("loadNextLevel 2");
 
         let wrongLevels = [];
         let newLevels = [];

src/module/Application/pwa/js/site/LevelSite.js

@@ -96,14 +96,13 @@ export class LevelSite extends WordRotatorBaseSite {
         this.findBy("#help-button").addEventListener("click", () => {
             this.help();
         });
-
-        this.loadLastLevel();
+        await this.loadLastLevel();
     }
 
     async loadLastLevel() {
         try {
             let currentLevelInfo = localStorage.getItem("currentLevel");
-            if (currentLevelInfo !== null) {
+            if (Helper.isNotNull(currentLevelInfo)) {
                 currentLevelInfo = JSON.parse(currentLevelInfo);
 
                 const db = WordRotatorDb.getInstance();
@@ -151,7 +150,9 @@ export class LevelSite extends WordRotatorBaseSite {
             this.wonText.style.fontSize = "0";
 
             const db = WordRotatorDb.getInstance();
+            console.log("nextLevel  2");
             const nextLevelJson = await db.loadNextLevel(LevelSite.RENDERER_TYPES);
+            console.log("nextLevel  3");
 
             if (nextLevelJson === null) {
                 this.startSite(EndSite);