From 8833a62f82c4b16177cbf752836d07e8d12896f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Tue, 19 Feb 2019 01:19:44 +0100 Subject: [PATCH] make police sprechwunsch more smart --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 16 +++++----------- src/autoloaderV2.js | 14 ++++---------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index d88a75e..95a54e9 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Tue Feb 19 2019 01:15:21 GMT+0100 (CET)*/ +/*Generated on:Tue Feb 19 2019 01:19:44 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 1e0789a..c726b81 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Tue Feb 19 2019 01:15:21 GMT+0100 (CET)*/ +/*Generated on:Tue Feb 19 2019 01:19:44 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(); @@ -18640,15 +18640,9 @@ } }); } - - 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);`); - }); - } + } + 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) => { diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 85fd2af..7fb08c4 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(); @@ -841,15 +841,9 @@ } }); } - - 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);`); - }); - } + } + 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) => {