From cfb0fbf768c9c653591c09fd9f9c323249d40451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Fri, 11 Jan 2019 04:15:04 +0100 Subject: [PATCH] jails --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 20 ++++++++++---------- src/autoloaderV2.js | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index d5b2442..114502d 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Fri Jan 11 2019 04:08:37 GMT+0100 (CET)*/ +/*Generated on:Fri Jan 11 2019 04:15:03 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 9b53838..b2eb14f 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Fri Jan 11 2019 04:08:37 GMT+0100 (CET)*/ +/*Generated on:Fri Jan 11 2019 04:15:03 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -17787,13 +17787,8 @@ class AutomaticDispose { var self = this; var JailHref = this.Jails[0].href 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}');`); + tellParent(`console.log('wunsch:1000:done:${window.name}:${MissionID}');window.AutomaticDisposeCall.FreeIframe('${window.name}');`); document.location.href = document.location.origin + JailHref; }); } @@ -18426,9 +18421,14 @@ class AutomaticDispose { 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), 1000, Runner); + if (runnerID === -1 && Runner == 'adis-sprechwunsch-police') { + $('#' + runnerIframe).attr("src", ''); + $('#' + runnerIframe).attr("mission_id", 'empty'); + } else { + $('#' + runnerIframe).attr("src", ''); + $('#' + runnerIframe).attr("mission_id", 'empty'); + setTimeout(self.OpenNextMission.bind(self), 1000, Runner); + } } UpdateMissionsToDone(MissionID) { diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index cbf0f7f..1355deb 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -667,13 +667,8 @@ class AutomaticDispose { var self = this; var JailHref = this.Jails[0].href 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}');`); + tellParent(`console.log('wunsch:1000:done:${window.name}:${MissionID}');window.AutomaticDisposeCall.FreeIframe('${window.name}');`); document.location.href = document.location.origin + JailHref; }); } @@ -1072,9 +1067,14 @@ class AutomaticDispose { 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), 1000, Runner); + if (runnerID === -1 && Runner == 'adis-sprechwunsch-police') { + $('#' + runnerIframe).attr("src", ''); + $('#' + runnerIframe).attr("mission_id", 'empty'); + } else { + $('#' + runnerIframe).attr("src", ''); + $('#' + runnerIframe).attr("mission_id", 'empty'); + setTimeout(self.OpenNextMission.bind(self), 1000, Runner); + } } UpdateMissionsToDone(MissionID) {