diff --git a/dist/autoloader.js b/dist/autoloader.js index 114502d..2801965 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Fri Jan 11 2019 04:15:03 GMT+0100 (CET)*/ +/*Generated on:Fri Jan 11 2019 04:18:11 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 b2eb14f..0a32d32 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Fri Jan 11 2019 04:15:03 GMT+0100 (CET)*/ +/*Generated on:Fri Jan 11 2019 04:18:11 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -17788,7 +17788,7 @@ class AutomaticDispose { var JailHref = this.Jails[0].href var MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { - tellParent(`console.log('wunsch:1000:done:${window.name}:${MissionID}');window.AutomaticDisposeCall.FreeIframe('${window.name}');`); + tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('${window.name}');},250);`); document.location.href = document.location.origin + JailHref; }); } @@ -18421,9 +18421,9 @@ class AutomaticDispose { const self = this; const runnerID = self.ADisSettings.runner.indexOf(Runner) const runnerIframe = self.ADisSettings.runner_iframes[runnerID]; - if (runnerID === -1 && Runner == 'adis-sprechwunsch-police') { - $('#' + runnerIframe).attr("src", ''); - $('#' + runnerIframe).attr("mission_id", 'empty'); + if (Runner == 'adis-sprechwunsch-police') { + $('#' + Runner).attr("src", ''); + $('#' + Runner).attr("mission_id", 'empty'); } else { $('#' + runnerIframe).attr("src", ''); $('#' + runnerIframe).attr("mission_id", 'empty'); diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 1355deb..4d68f58 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -668,7 +668,7 @@ class AutomaticDispose { var JailHref = this.Jails[0].href var MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { - tellParent(`console.log('wunsch:1000:done:${window.name}:${MissionID}');window.AutomaticDisposeCall.FreeIframe('${window.name}');`); + tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('${window.name}');},250);`); document.location.href = document.location.origin + JailHref; }); } @@ -1067,9 +1067,9 @@ class AutomaticDispose { const self = this; const runnerID = self.ADisSettings.runner.indexOf(Runner) const runnerIframe = self.ADisSettings.runner_iframes[runnerID]; - if (runnerID === -1 && Runner == 'adis-sprechwunsch-police') { - $('#' + runnerIframe).attr("src", ''); - $('#' + runnerIframe).attr("mission_id", 'empty'); + if (Runner == 'adis-sprechwunsch-police') { + $('#' + Runner).attr("src", ''); + $('#' + Runner).attr("mission_id", 'empty'); } else { $('#' + runnerIframe).attr("src", ''); $('#' + runnerIframe).attr("mission_id", 'empty');