diff --git a/dist/autoloader.js b/dist/autoloader.js index 4963320..d88a75e 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Tue Feb 19 2019 00:48:16 GMT+0100 (CET)*/ +/*Generated on:Tue Feb 19 2019 01:15:21 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 d488c5d..1e0789a 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Tue Feb 19 2019 00:48:16 GMT+0100 (CET)*/ +/*Generated on:Tue Feb 19 2019 01:15:21 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18431,7 +18431,7 @@ Check_Call_Police_Active() { let self = this; - if (($('#h2_prisoners').length > 0 || $('img.patientPrisonerIcon').length > 0) /*&& !self.includesString($('#missionH1').text(),'[verband]')*/ ) { + if (($('#h2_prisoners').length > 0 || $('img.patientPrisonerIcon').length > 0) && !self.includesString($('#missionH1').text(),'[verband]') ) { //TODO: check if Verband or Event and // Maybe done with //__FIXX__20192 self.Collect_Jails(); @@ -18643,6 +18643,11 @@ if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) { $('#mission_alarm_btn').click(); + } else { + let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); + self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { + tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`); + }); } } else { let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 9a8261d..85fd2af 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -632,7 +632,7 @@ Check_Call_Police_Active() { let self = this; - if (($('#h2_prisoners').length > 0 || $('img.patientPrisonerIcon').length > 0) /*&& !self.includesString($('#missionH1').text(),'[verband]')*/ ) { + if (($('#h2_prisoners').length > 0 || $('img.patientPrisonerIcon').length > 0) && !self.includesString($('#missionH1').text(),'[verband]') ) { //TODO: check if Verband or Event and // Maybe done with //__FIXX__20192 self.Collect_Jails(); @@ -844,6 +844,11 @@ if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) { $('#mission_alarm_btn').click(); + } else { + let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); + self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { + tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`); + }); } } else { let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);