From 579facabbccb06a96ee2ac3acd6b7259e6368ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Wed, 19 Dec 2018 16:02:18 +0100 Subject: [PATCH] v2 upa09 --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 14 +++++++------- src/autoloaderV2.js | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 41396d9..75745d7 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Dec 19 2018 15:57:00 GMT+0100 (CET)*/ +/*Generated on:Wed Dec 19 2018 16:02:18 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 7db9494..e9757c3 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Dec 19 2018 15:57:00 GMT+0100 (CET)*/ +/*Generated on:Wed Dec 19 2018 16:02:18 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18452,30 +18452,30 @@ class AutomaticDispose { MainHandler() { const self = this; if (self.includesString($('div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { - setTimeout(function () { + console.log("DONE!"); console.log("DONE: ", self.MissionID); return self.RemoveMissionsFromQueue(self.MissionID).then(() => { return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed }) - }, 250); + } else if (self.includesString($('#iframe-inside-container div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert")) { - setTimeout(function () { + console.log("SEND"); console.log("SEND: ", self.MissionID); return self.UpdateMissionsToDone(self.MissionID).then(() => { return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full }); - }, 250); + } else { - setTimeout(function () { + if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) { console.log("WILL SEND?") self.CheckMissionAutomatic(); } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { self.WorkVerbandMission(); } - }, 250); + } } diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 85687aa..a2dbe58 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -1211,30 +1211,30 @@ class AutomaticDispose { MainHandler() { const self = this; if (self.includesString($('div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { - setTimeout(function () { + console.log("DONE!"); console.log("DONE: ", self.MissionID); return self.RemoveMissionsFromQueue(self.MissionID).then(() => { return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed }) - }, 250); + } else if (self.includesString($('#iframe-inside-container div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert")) { - setTimeout(function () { + console.log("SEND"); console.log("SEND: ", self.MissionID); return self.UpdateMissionsToDone(self.MissionID).then(() => { return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full }); - }, 250); + } else { - setTimeout(function () { + if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) { console.log("WILL SEND?") self.CheckMissionAutomatic(); } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { self.WorkVerbandMission(); } - }, 250); + } }