diff --git a/dist/autoloader.js b/dist/autoloader.js index b4f9048..0d1eefd 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Dec 17 2018 23:28:04 GMT+0100 (CET)*/ +/*Generated on:Mon Dec 17 2018 23:31:49 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 b92aeb4..acc990c 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Dec 17 2018 23:28:04 GMT+0100 (CET)*/ +/*Generated on:Mon Dec 17 2018 23:31:49 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18430,16 +18430,15 @@ class AutomaticDispose { 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 }) - } - if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) { + } else if (self.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"); console.log("SEND: " + self.MissionID); return self.UpdateMissionsToDone(self.MissionID).then(() => { - return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full + return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full }); } else { setTimeout(function () { - if (['adis-ownmissions', 'adis-plannedeventss', 'adis-krankentransporte'].indexOf(window.name) != -1) { + 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) { @@ -18515,7 +18514,7 @@ class AutomaticDispose { CheckMissionAutomatic() { const self = this; var setOpt; - if (window.name == 'adis-ownmissions' || window.name == 'adis-plannedeventss') { + if (window.name == 'adis-ownmissions' || window.name == 'adis-plannedevents') { setOpt = 'MissionsOwn-Automatic'; } else if (window.name == 'adis-krankentransporte') { setOpt = 'Krankentransport-Automatic'; diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index ca609dc..566f80e 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -1189,16 +1189,15 @@ class AutomaticDispose { 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 }) - } - if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) { + } else if (self.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"); console.log("SEND: " + self.MissionID); return self.UpdateMissionsToDone(self.MissionID).then(() => { - return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full + return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full }); } else { setTimeout(function () { - if (['adis-ownmissions', 'adis-plannedeventss', 'adis-krankentransporte'].indexOf(window.name) != -1) { + 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) { @@ -1274,7 +1273,7 @@ class AutomaticDispose { CheckMissionAutomatic() { const self = this; var setOpt; - if (window.name == 'adis-ownmissions' || window.name == 'adis-plannedeventss') { + if (window.name == 'adis-ownmissions' || window.name == 'adis-plannedevents') { setOpt = 'MissionsOwn-Automatic'; } else if (window.name == 'adis-krankentransporte') { setOpt = 'Krankentransport-Automatic';