diff --git a/dist/autoloader.js b/dist/autoloader.js index d33d645..c3f4c51 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Fri Jan 11 2019 03:45:33 GMT+0100 (CET)*/ +/*Generated on:Fri Jan 11 2019 04:07:33 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 4458730..3393e9f 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Fri Jan 11 2019 03:45:33 GMT+0100 (CET)*/ +/*Generated on:Fri Jan 11 2019 04:07:33 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -17561,12 +17561,12 @@ class AutomaticDispose { $("#adis-sprechwunsch-police-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $("#adis-sprechwunsch-police-frame").attr("mission_id", MissionID); - self.PoliceVehicleFrameWatchDog = setTimeout((MissionID) => { - self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { - $("#adis-sprechwunsch-police-frame").attr("src", ""); - $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty"); - }); - }, 1500, MissionID); + //self.PoliceVehicleFrameWatchDog = setTimeout((MissionID) => { + // self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { + // $("#adis-sprechwunsch-police-frame").attr("src", ""); + // $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty"); + // }); + //}, 1500, MissionID); } }); }); @@ -17785,7 +17785,16 @@ class AutomaticDispose { // Gefängnis einlieferung Send_Vehicle_To_Jail() { var JailHref = this.Jails[0].href - document.location.href = document.location.origin + JailHref; + var MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); + const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name); + self.MyRunner = self.ADisSettings.runner[runnerID]; + self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID]; + self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { + $("#adis-sprechwunsch-police-frame").attr("src", ""); + $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty"); + tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); + document.location.href = document.location.origin + JailHref; + }); } // - diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 3f39e2a..842cfc5 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -441,12 +441,12 @@ class AutomaticDispose { $("#adis-sprechwunsch-police-frame").attr("src", "https://www.leitstellenspiel.de/missions/" + MissionID); $("#adis-sprechwunsch-police-frame").attr("mission_id", MissionID); - self.PoliceVehicleFrameWatchDog = setTimeout((MissionID) => { - self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { - $("#adis-sprechwunsch-police-frame").attr("src", ""); - $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty"); - }); - }, 1500, MissionID); + //self.PoliceVehicleFrameWatchDog = setTimeout((MissionID) => { + // self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { + // $("#adis-sprechwunsch-police-frame").attr("src", ""); + // $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty"); + // }); + //}, 1500, MissionID); } }); }); @@ -665,7 +665,16 @@ class AutomaticDispose { // Gefängnis einlieferung Send_Vehicle_To_Jail() { var JailHref = this.Jails[0].href - document.location.href = document.location.origin + JailHref; + var MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); + const runnerID = self.ADisSettings.runner_iframesName.indexOf(window.name); + self.MyRunner = self.ADisSettings.runner[runnerID]; + self.MyRunnerSettings = self.ADisSettings.runner_settings[runnerID]; + self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { + $("#adis-sprechwunsch-police-frame").attr("src", ""); + $("#adis-sprechwunsch-police-frame").attr("mission_id", "empty"); + tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); + document.location.href = document.location.origin + JailHref; + }); } // -