From c395794da9923fe7c66f1ec2bac0c93e95fb10e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Sun, 2 Dec 2018 10:10:38 +0100 Subject: [PATCH] v2 up handler remove finish missions --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 26 ++++++++++++++++++++------ src/autoloaderV2.js | 24 +++++++++++++++++++----- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 526f7bb..29afbd3 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sun Dec 02 2018 09:58:27 GMT+0100 (CET)*/ +/*Generated on:Sun Dec 02 2018 10:10:37 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 b54cf6a..3794342 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Sun Dec 02 2018 09:58:27 GMT+0100 (CET)*/ +/*Generated on:Sun Dec 02 2018 10:10:37 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18171,6 +18171,15 @@ class AutomaticDispose { }) } + FreeIframe(Runner){ + const self = this; + const runnerID = self.ADisSettings.runner.indexOf(Runner) + const runnerIframe = self.ADisSettings.runner_iframes[runnerID]; + $('#' + runnerIframe).attr("src", ''); + $('#' + runnerIframe).attr("mission_id", 'empty'); + setTimeout(self.OpenNextMission.bind(self), 5000, Runner); + } + UpdateMissionsToDone(MissionID) { const self = this; return self.ADisDB.ADisMissions.update(MissionID, { @@ -18294,10 +18303,12 @@ class AutomaticDispose { return self.MainHandler() }); } - return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); + self.RemoveMissionsFromQueue(self.MissionID) + return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); }); } - return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); + self.RemoveMissionsFromQueue(self.MissionID) + return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); }) }, 1500); } @@ -18307,11 +18318,13 @@ class AutomaticDispose { const self = this; if (includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { console.log("DONE!"); - return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); // delete Mission here as completed + self.RemoveMissionsFromQueue(self.MissionID) + return tellParent(`console.log('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"); - return tellParent(`console.log('update:${window.name}:${self.MissionID}');MissionUpdateDone('${window.name}', '${self.MissionID}');`); // update Mission here as updated or full + self.UpdateMissionsToDone(self.MissionID); + return tellParent(`console.log('update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full } else { setTimeout(function () { if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) { @@ -18472,7 +18485,8 @@ class AutomaticDispose { console.log("WILL KLICK SEND") setTimeout(() => { $('#mission_alarm_btn').click(); - tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');MissionUpdateDone('${window.name}', '${self.MissionID}');},500);`); + self.UpdateMissionsToDone(self.MissionID); + tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');},500);`); }, 250); } }) diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index e1bc048..db2d696 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -1001,6 +1001,15 @@ class AutomaticDispose { }) } + FreeIframe(Runner){ + const self = this; + const runnerID = self.ADisSettings.runner.indexOf(Runner) + const runnerIframe = self.ADisSettings.runner_iframes[runnerID]; + $('#' + runnerIframe).attr("src", ''); + $('#' + runnerIframe).attr("mission_id", 'empty'); + setTimeout(self.OpenNextMission.bind(self), 5000, Runner); + } + UpdateMissionsToDone(MissionID) { const self = this; return self.ADisDB.ADisMissions.update(MissionID, { @@ -1124,10 +1133,12 @@ class AutomaticDispose { return self.MainHandler() }); } - return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); + self.RemoveMissionsFromQueue(self.MissionID) + return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); }); } - return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); + self.RemoveMissionsFromQueue(self.MissionID) + return tellParent(`console.log('done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); }) }, 1500); } @@ -1137,11 +1148,13 @@ class AutomaticDispose { const self = this; if (includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) { console.log("DONE!"); - return tellParent(`console.log('done:${window.name}:${self.MissionID}');MissionDelete('${window.name}', '${self.MissionID}');`); // delete Mission here as completed + self.RemoveMissionsFromQueue(self.MissionID) + return tellParent(`console.log('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"); - return tellParent(`console.log('update:${window.name}:${self.MissionID}');MissionUpdateDone('${window.name}', '${self.MissionID}');`); // update Mission here as updated or full + self.UpdateMissionsToDone(self.MissionID); + return tellParent(`console.log('update:${window.name}:${self.MissionID}');`); // update Mission here as updated or full } else { setTimeout(function () { if (['adis-ownmissions', 'adis-krankentransporte'].indexOf(window.name) != -1) { @@ -1302,7 +1315,8 @@ class AutomaticDispose { console.log("WILL KLICK SEND") setTimeout(() => { $('#mission_alarm_btn').click(); - tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');MissionUpdateDone('${window.name}', '${self.MissionID}');},500);`); + self.UpdateMissionsToDone(self.MissionID); + tellParent(`setTimeout(function(){console.log('ok:${window.name}:${self.MissionID}');},500);`); }, 250); } })