v2 iaofhaoifaoj

This commit is contained in:
2018-12-02 10:51:09 +01:00
parent 0af304b058
commit 8572652eeb
3 changed files with 64 additions and 64 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
/*Generated on:Sun Dec 02 2018 10:49:01 GMT+0100 (CET)*/ /*Generated on:Sun Dec 02 2018 10:51:08 GMT+0100 (CET)*/
var AutomaticDispose_Branch = "master"; var AutomaticDispose_Branch = "master";
var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
var da_lss_adis_time = new Date().getTime(); var da_lss_adis_time = new Date().getTime();
+32 -32
View File
@@ -1,4 +1,4 @@
/*Generated on:Sun Dec 02 2018 10:49:01 GMT+0100 (CET)*/ /*Generated on:Sun Dec 02 2018 10:51:08 GMT+0100 (CET)*/
/* /*
* Dexie.js - a minimalistic wrapper for IndexedDB * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -18192,12 +18192,10 @@ class AutomaticDispose {
RemoveMissionsFromQueue(MissionID) { RemoveMissionsFromQueue(MissionID) {
const self = this; const self = this;
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => { return self.ADisDB.ADisMissions.where({
return self.ADisDB.ADisMissions.where({ missionID: MissionID
missionID: MissionID }).delete().catch((err) => {
}).delete().catch((err) => { console.error(err)
console.error(err)
})
}) })
} }
@@ -18290,33 +18288,35 @@ class AutomaticDispose {
console.log("Window", window.name); console.log("Window", window.name);
console.log("self.MyRunner", self.MyRunner); console.log("self.MyRunner", self.MyRunner);
console.log("self.MyRunnerSettings", self.MyRunnerSettings); console.log("self.MyRunnerSettings", self.MyRunnerSettings);
self.ADSettings().then((setting) => { return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => {
if (setting[self.MyRunnerSettings] === 'true') { self.ADSettings().then((setting) => {
if (setting[self.MyRunnerSettings] === 'true') {
let where = { let where = {
missionID: self.MissionID, missionID: self.MissionID,
runner: self.MyRunner, runner: self.MyRunner,
done: 'false' done: 'false'
}
console.log(where);
return self.ADisDB.ADisMissions.where(where).limit(1)
}
}).then((Wunsch) => {
if (Wunsch !== undefined) {
return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((mywunsch) => {
return self.MainHandler()
});
} else {
self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
} }
}); console.log(where);
} else { return self.ADisDB.ADisMissions.where(where).limit(1)
self.RemoveMissionsFromQueue(self.MissionID) }
return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); }).then((Wunsch) => {
} if (Wunsch !== undefined) {
return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((mywunsch) => {
return self.MainHandler()
});
} else {
self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
}
});
} else {
self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
}
})
}) })
}, 1500); }, 1500);
} }
+31 -31
View File
@@ -1022,12 +1022,10 @@ class AutomaticDispose {
RemoveMissionsFromQueue(MissionID) { RemoveMissionsFromQueue(MissionID) {
const self = this; const self = this;
return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => { return self.ADisDB.ADisMissions.where({
return self.ADisDB.ADisMissions.where({ missionID: MissionID
missionID: MissionID }).delete().catch((err) => {
}).delete().catch((err) => { console.error(err)
console.error(err)
})
}) })
} }
@@ -1120,33 +1118,35 @@ class AutomaticDispose {
console.log("Window", window.name); console.log("Window", window.name);
console.log("self.MyRunner", self.MyRunner); console.log("self.MyRunner", self.MyRunner);
console.log("self.MyRunnerSettings", self.MyRunnerSettings); console.log("self.MyRunnerSettings", self.MyRunnerSettings);
self.ADSettings().then((setting) => { return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => {
if (setting[self.MyRunnerSettings] === 'true') { self.ADSettings().then((setting) => {
if (setting[self.MyRunnerSettings] === 'true') {
let where = { let where = {
missionID: self.MissionID, missionID: self.MissionID,
runner: self.MyRunner, runner: self.MyRunner,
done: 'false' done: 'false'
}
console.log(where);
return self.ADisDB.ADisMissions.where(where).limit(1)
}
}).then((Wunsch) => {
if (Wunsch !== undefined) {
return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((mywunsch) => {
return self.MainHandler()
});
} else {
self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
} }
}); console.log(where);
} else { return self.ADisDB.ADisMissions.where(where).limit(1)
self.RemoveMissionsFromQueue(self.MissionID) }
return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); }).then((Wunsch) => {
} if (Wunsch !== undefined) {
return Wunsch.count(function (count) {
if (count > 0) {
return Wunsch.each((mywunsch) => {
return self.MainHandler()
});
} else {
self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
}
});
} else {
self.RemoveMissionsFromQueue(self.MissionID)
return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
}
})
}) })
}, 1500); }, 1500);
} }