Merge remote-tracking branch 'origin/master'
# Conflicts: # public/js/app.js
This commit is contained in:
commit
5b537790cc
@ -11,8 +11,6 @@ rm -rf src/scss/lib
|
||||
mkdir -p src/js/lib/
|
||||
mkdir -p src/scss/lib/
|
||||
|
||||
|
||||
|
||||
for d in "vendor/ainias/pwa"*/; do
|
||||
|
||||
find $d$jsSourceDir -name '*.js' -exec cp -r '{}' src/js/lib/ \;
|
||||
|
||||
7895
public/js/app.js
7895
public/js/app.js
File diff suppressed because one or more lines are too long
@ -11,7 +11,7 @@ export class WordRotatorDb extends MyDb {
|
||||
}
|
||||
|
||||
constructor() {
|
||||
super("wordRotator", 4);
|
||||
super("wordRotator", 6);
|
||||
}
|
||||
|
||||
upgrade(db, oldVersion, newVersion, e) {
|
||||
@ -24,13 +24,16 @@ export class WordRotatorDb extends MyDb {
|
||||
let levelObjectStore = e.target.transaction.objectStore(WordRotatorDb.OBJECT_STORE.LEVEL);
|
||||
levelObjectStore.createIndex("played", ["deleted", "played", "difficulty", "id"], {"unique": false});
|
||||
}
|
||||
// xhklsfdbnk = 42;
|
||||
if (Helper.isNull(oldVersion) || oldVersion < 3 && newVersion >= 3) {
|
||||
let levelObjectStore = e.target.transaction.objectStore(WordRotatorDb.OBJECT_STORE.LEVEL);
|
||||
levelObjectStore.createIndex("difficulty", "difficulty", {"unique": false});
|
||||
}
|
||||
|
||||
if (Helper.isNull(oldVersion) || oldVersion < 3 && newVersion >= 4) {
|
||||
console.log("update", oldVersion, newVersion);
|
||||
if (Helper.isNull(oldVersion) || oldVersion < 6 && newVersion >= 6) {
|
||||
try {
|
||||
db.deleteObjectStore(WordRotatorDb.OBJECT_STORE.SYSTEM_VARS);
|
||||
} catch (e) {}
|
||||
let levelObjectStore = db.createObjectStore(WordRotatorDb.OBJECT_STORE.SYSTEM_VARS, {"keyPath": "name"});
|
||||
}
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user