From 612aa8168f8b2700cba8f49ee1c8fc6294c2e872 Mon Sep 17 00:00:00 2001 From: silas Date: Sun, 4 Nov 2018 16:49:13 +0100 Subject: [PATCH] update to pc --- bin/test.sh | 4 ++-- public/js/app.js | 12 ++++++++---- src/js/lib/pwa-lib.js | 11 +++++++---- src/module/Application/pwa/js/WordRotatorDb.js | 1 + src/module/Application/pwa/js/site/MenuSite.js | 1 + test/test.testcafe.js | 3 +-- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/bin/test.sh b/bin/test.sh index 1edcd5e..6f45b7c 100644 --- a/bin/test.sh +++ b/bin/test.sh @@ -2,5 +2,5 @@ cd $(dirname "$0")/.. -#testcafe firefox test/test.testcafe.js -node bin/testcafe.js; \ No newline at end of file +testcafe firefox test/test.testcafe.js +#node bin/testcafe.js; \ No newline at end of file diff --git a/public/js/app.js b/public/js/app.js index d6ef56c..1e39e91 100755 --- a/public/js/app.js +++ b/public/js/app.js @@ -2296,7 +2296,6 @@ class PauseSite extends AbstractSite { } onPause() { - console.log("onPause"); for (let i = 0; i < PauseSite.onStartListeners.length; i++) { if (typeof PauseSite.onStartListeners[i] === "function") { PauseSite.onStartListeners[i](); @@ -2306,7 +2305,6 @@ class PauseSite extends AbstractSite { } onStart() { - console.log("onStart"); for (let i = 0; i < PauseSite.onPauseListeners.length; i++) { if (typeof PauseSite.onPauseListeners[i] === "function") { PauseSite.onPauseListeners[i](); @@ -2762,8 +2760,9 @@ FlashMessenger.MESSAGE_TYPE_INFO = 'info'; FlashMessenger.MESSAGE_TYPE_WARNING = 'warning'; class MyDb { - constructor(dbName, version) { - let indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB; + constructor(dbName, version, indexedDB) { + indexedDB = indexedDB || window["myIndexedDB"] || window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB; + console.log("MyDB", indexedDB); this._conn = indexedDB.open(dbName, version); let myDB = this; @@ -2849,9 +2848,12 @@ class MyDb { load(key, objectStore) { let self = this; return new Promise( (resolve, reject) => { + console.log("load 1"); self.openStore(objectStore, function (store) { + console.log("load 2"); let request = store.get(key); request.onsuccess = function (e) { + console.log("load 3"); resolve(e.currentTarget.result); }; request.onerror = function (e) { @@ -6431,6 +6433,7 @@ class WordRotatorDb extends MyDb { } async loadLevel(levelId) { + console.log("load Level", levelId); return this.load(levelId, WordRotatorDb.OBJECT_STORE.LEVEL); } @@ -7171,6 +7174,7 @@ class MenuSite extends WordRotatorBaseSite { let currentLevel = levels[i]; levelPromises.push(db.loadLevel(levels[i]["id"]).then(level => { currentLevel["played"] = (Helper.nonNull(Helper.nonNull(level, {}).played, false)); + console.log("currentLevel", currentLevel); return currentLevel; })); } diff --git a/src/js/lib/pwa-lib.js b/src/js/lib/pwa-lib.js index 6cff053..c66290b 100755 --- a/src/js/lib/pwa-lib.js +++ b/src/js/lib/pwa-lib.js @@ -2296,7 +2296,6 @@ class PauseSite extends AbstractSite { } onPause() { - console.log("onPause"); for (let i = 0; i < PauseSite.onStartListeners.length; i++) { if (typeof PauseSite.onStartListeners[i] === "function") { PauseSite.onStartListeners[i](); @@ -2306,7 +2305,6 @@ class PauseSite extends AbstractSite { } onStart() { - console.log("onStart"); for (let i = 0; i < PauseSite.onPauseListeners.length; i++) { if (typeof PauseSite.onPauseListeners[i] === "function") { PauseSite.onPauseListeners[i](); @@ -3405,8 +3403,9 @@ class GapiHandler { } class MyDb { - constructor(dbName, version) { - let indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB; + constructor(dbName, version, indexedDB) { + indexedDB = indexedDB || window["myIndexedDB"] || window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB; + console.log("MyDB", indexedDB); this._conn = indexedDB.open(dbName, version); let myDB = this; @@ -3447,6 +3446,7 @@ class MyDb { transactionMode = "readonly"; } return this.openTransaction(name, transactionMode, function (t) { + console.log("openStore", name, t); callback(t.objectStore(name)); }); } @@ -3492,9 +3492,12 @@ class MyDb { load(key, objectStore) { let self = this; return new Promise( (resolve, reject) => { + console.log("load 1"); self.openStore(objectStore, function (store) { + console.log("load 2"); let request = store.get(key); request.onsuccess = function (e) { + console.log("load 3"); resolve(e.currentTarget.result); }; request.onerror = function (e) { diff --git a/src/module/Application/pwa/js/WordRotatorDb.js b/src/module/Application/pwa/js/WordRotatorDb.js index 16ac211..ec6fd17 100755 --- a/src/module/Application/pwa/js/WordRotatorDb.js +++ b/src/module/Application/pwa/js/WordRotatorDb.js @@ -35,6 +35,7 @@ export class WordRotatorDb extends MyDb { } async loadLevel(levelId) { + console.log("load Level", levelId); return this.load(levelId, WordRotatorDb.OBJECT_STORE.LEVEL); } diff --git a/src/module/Application/pwa/js/site/MenuSite.js b/src/module/Application/pwa/js/site/MenuSite.js index e59767b..6d9548c 100644 --- a/src/module/Application/pwa/js/site/MenuSite.js +++ b/src/module/Application/pwa/js/site/MenuSite.js @@ -204,6 +204,7 @@ export class MenuSite extends WordRotatorBaseSite { let currentLevel = levels[i]; levelPromises.push(db.loadLevel(levels[i]["id"]).then(level => { currentLevel["played"] = (Helper.nonNull(Helper.nonNull(level, {}).played, false)); + console.log("currentLevel", currentLevel); return currentLevel; })); } diff --git a/test/test.testcafe.js b/test/test.testcafe.js index 507aca0..bfa14db 100644 --- a/test/test.testcafe.js +++ b/test/test.testcafe.js @@ -2,7 +2,7 @@ import {Selector} from 'testcafe'; import {ClientFunction} from 'testcafe'; let isLocal = true; -let isMobile = true; +let isMobile = false; const checkMatrix = async (matrixStringSelector, shouldValues, timeout) => { let delta = 0.0001; @@ -25,7 +25,6 @@ const checkMatrix = async (matrixStringSelector, shouldValues, timeout) => { console.error(values[i] +" not "+ shouldValues[i] + " with", values, shouldValues, i ); return false; } - } } return true;