diff --git a/dist/autoloader.js b/dist/autoloader.js index bfe5a2b..0455fca 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sun Dec 02 2018 10:17:13 GMT+0100 (CET)*/ +/*Generated on:Sun Dec 02 2018 10:21:23 GMT+0100 (CET)*/ var AutomaticDispose_Branch = "master"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var da_lss_adis_time = new Date().getTime(); diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js index 5be2527..b120274 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Sun Dec 02 2018 10:17:13 GMT+0100 (CET)*/ +/*Generated on:Sun Dec 02 2018 10:21:23 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18294,8 +18294,6 @@ class AutomaticDispose { missionID: self.MissionID, runner: self.MyRunner, done: 'false' - }).and(function (item) { - return item.next_check <= Math.floor(new Date().getTime() / 1000) }).limit(1) } }).then((Wunsch) => { @@ -18307,12 +18305,12 @@ class AutomaticDispose { }); } else { self.RemoveMissionsFromQueue(self.MissionID) - return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); + 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('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); + return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); } }) }, 1500); @@ -18324,12 +18322,12 @@ class AutomaticDispose { if (includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { console.log("DONE!"); self.RemoveMissionsFromQueue(self.MissionID) - return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed + return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed } if (includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) { console.log("SEND"); self.UpdateMissionsToDone(self.MissionID); - return tellParent(`console.log('update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full + return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full } else { setTimeout(function () { if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) { diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index a3640be..2ed5eb8 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -1124,8 +1124,6 @@ class AutomaticDispose { missionID: self.MissionID, runner: self.MyRunner, done: 'false' - }).and(function (item) { - return item.next_check <= Math.floor(new Date().getTime() / 1000) }).limit(1) } }).then((Wunsch) => { @@ -1137,12 +1135,12 @@ class AutomaticDispose { }); } else { self.RemoveMissionsFromQueue(self.MissionID) - return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); + 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('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); + return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); } }) }, 1500); @@ -1154,12 +1152,12 @@ class AutomaticDispose { if (includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { console.log("DONE!"); self.RemoveMissionsFromQueue(self.MissionID) - return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed + return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed } if (includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) { console.log("SEND"); self.UpdateMissionsToDone(self.MissionID); - return tellParent(`console.log('update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full + return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full } else { setTimeout(function () { if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) {