Ainias/wordRotator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to pc

Browse Source
This commit is contained in:
silas 2018-11-04 16:49:13 +01:00
parent 3b78a63e67
commit 612aa8168f
6 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/test.sh
View File

@ -2,5 +2,5 @@
cd $(dirname "$0")/.. cd $(dirname "$0")/..
#testcafe firefox test/test.testcafe.js testcafe firefox test/test.testcafe.js
node bin/testcafe.js; #node bin/testcafe.js;

12
public/js/app.js
View File

@ -2296,7 +2296,6 @@ class PauseSite extends AbstractSite {
} }
onPause() { onPause() {
console.log("onPause");
for (let i = 0; i < PauseSite.onStartListeners.length; i++) { for (let i = 0; i < PauseSite.onStartListeners.length; i++) {
if (typeof PauseSite.onStartListeners[i] === "function") { if (typeof PauseSite.onStartListeners[i] === "function") {
PauseSite.onStartListeners[i](); PauseSite.onStartListeners[i]();
@ -2306,7 +2305,6 @@ class PauseSite extends AbstractSite {
} }
onStart() { onStart() {
console.log("onStart");
for (let i = 0; i < PauseSite.onPauseListeners.length; i++) { for (let i = 0; i < PauseSite.onPauseListeners.length; i++) {
if (typeof PauseSite.onPauseListeners[i] === "function") { if (typeof PauseSite.onPauseListeners[i] === "function") {
PauseSite.onPauseListeners[i](); PauseSite.onPauseListeners[i]();
@ -2762,8 +2760,9 @@ FlashMessenger.MESSAGE_TYPE_INFO = 'info';
FlashMessenger.MESSAGE_TYPE_WARNING = 'warning'; FlashMessenger.MESSAGE_TYPE_WARNING = 'warning';
class MyDb { class MyDb {
constructor(dbName, version) { constructor(dbName, version, indexedDB) {
let indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB; indexedDB = indexedDB || window["myIndexedDB"] || window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB;
console.log("MyDB", indexedDB);
this._conn = indexedDB.open(dbName, version); this._conn = indexedDB.open(dbName, version);
let myDB = this; let myDB = this;
@ -2849,9 +2848,12 @@ class MyDb {
load(key, objectStore) { load(key, objectStore) {
let self = this; let self = this;
return new Promise( (resolve, reject) => { return new Promise( (resolve, reject) => {
console.log("load 1");
self.openStore(objectStore, function (store) { self.openStore(objectStore, function (store) {
console.log("load 2");
let request = store.get(key); let request = store.get(key);
request.onsuccess = function (e) { request.onsuccess = function (e) {
console.log("load 3");
resolve(e.currentTarget.result); resolve(e.currentTarget.result);
}; };
request.onerror = function (e) { request.onerror = function (e) {
@ -6431,6 +6433,7 @@ class WordRotatorDb extends MyDb {
} }
async loadLevel(levelId) { async loadLevel(levelId) {
console.log("load Level", levelId);
return this.load(levelId, WordRotatorDb.OBJECT_STORE.LEVEL); return this.load(levelId, WordRotatorDb.OBJECT_STORE.LEVEL);
} }
@ -7171,6 +7174,7 @@ class MenuSite extends WordRotatorBaseSite {
let currentLevel = levels[i]; let currentLevel = levels[i];
levelPromises.push(db.loadLevel(levels[i]["id"]).then(level => { levelPromises.push(db.loadLevel(levels[i]["id"]).then(level => {
currentLevel["played"] = (Helper.nonNull(Helper.nonNull(level, {}).played, false)); currentLevel["played"] = (Helper.nonNull(Helper.nonNull(level, {}).played, false));
console.log("currentLevel", currentLevel);
return currentLevel; return currentLevel;
})); }));
} }

11
src/js/lib/pwa-lib.js
View File

@ -2296,7 +2296,6 @@ class PauseSite extends AbstractSite {
} }
onPause() { onPause() {
console.log("onPause");
for (let i = 0; i < PauseSite.onStartListeners.length; i++) { for (let i = 0; i < PauseSite.onStartListeners.length; i++) {
if (typeof PauseSite.onStartListeners[i] === "function") { if (typeof PauseSite.onStartListeners[i] === "function") {
PauseSite.onStartListeners[i](); PauseSite.onStartListeners[i]();
@ -2306,7 +2305,6 @@ class PauseSite extends AbstractSite {
} }
onStart() { onStart() {
console.log("onStart");
for (let i = 0; i < PauseSite.onPauseListeners.length; i++) { for (let i = 0; i < PauseSite.onPauseListeners.length; i++) {
if (typeof PauseSite.onPauseListeners[i] === "function") { if (typeof PauseSite.onPauseListeners[i] === "function") {
PauseSite.onPauseListeners[i](); PauseSite.onPauseListeners[i]();
@ -3405,8 +3403,9 @@ class GapiHandler {
} }
class MyDb { class MyDb {
constructor(dbName, version) { constructor(dbName, version, indexedDB) {
let indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB; indexedDB = indexedDB || window["myIndexedDB"] || window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB || window.shimIndexedDB;
console.log("MyDB", indexedDB);
this._conn = indexedDB.open(dbName, version); this._conn = indexedDB.open(dbName, version);
let myDB = this; let myDB = this;
@ -3447,6 +3446,7 @@ class MyDb {
transactionMode = "readonly"; transactionMode = "readonly";
} }
return this.openTransaction(name, transactionMode, function (t) { return this.openTransaction(name, transactionMode, function (t) {
console.log("openStore", name, t);
callback(t.objectStore(name)); callback(t.objectStore(name));
}); });
} }
@ -3492,9 +3492,12 @@ class MyDb {
load(key, objectStore) { load(key, objectStore) {
let self = this; let self = this;
return new Promise( (resolve, reject) => { return new Promise( (resolve, reject) => {
console.log("load 1");
self.openStore(objectStore, function (store) { self.openStore(objectStore, function (store) {
console.log("load 2");
let request = store.get(key); let request = store.get(key);
request.onsuccess = function (e) { request.onsuccess = function (e) {
console.log("load 3");
resolve(e.currentTarget.result); resolve(e.currentTarget.result);
}; };
request.onerror = function (e) { request.onerror = function (e) {

1
src/module/Application/pwa/js/WordRotatorDb.js
View File

@ -35,6 +35,7 @@ export class WordRotatorDb extends MyDb {
} }
async loadLevel(levelId) { async loadLevel(levelId) {
console.log("load Level", levelId);
return this.load(levelId, WordRotatorDb.OBJECT_STORE.LEVEL); return this.load(levelId, WordRotatorDb.OBJECT_STORE.LEVEL);
} }

1
src/module/Application/pwa/js/site/MenuSite.js
View File

@ -204,6 +204,7 @@ export class MenuSite extends WordRotatorBaseSite {
let currentLevel = levels[i]; let currentLevel = levels[i];
levelPromises.push(db.loadLevel(levels[i]["id"]).then(level => { levelPromises.push(db.loadLevel(levels[i]["id"]).then(level => {
currentLevel["played"] = (Helper.nonNull(Helper.nonNull(level, {}).played, false)); currentLevel["played"] = (Helper.nonNull(Helper.nonNull(level, {}).played, false));
console.log("currentLevel", currentLevel);
return currentLevel; return currentLevel;
})); }));
} }

3
test/test.testcafe.js
View File

@ -2,7 +2,7 @@ import {Selector} from 'testcafe';
import {ClientFunction} from 'testcafe'; import {ClientFunction} from 'testcafe';
let isLocal = true; let isLocal = true;
let isMobile = true; let isMobile = false;
const checkMatrix = async (matrixStringSelector, shouldValues, timeout) => { const checkMatrix = async (matrixStringSelector, shouldValues, timeout) => {
let delta = 0.0001; 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 ); console.error(values[i] +" not "+ shouldValues[i] + " with", values, shouldValues, i );
return false; return false;
} }
} }
} }
return true; return true;