make police sprechwunsch more smart

This commit is contained in:
2019-02-19 01:19:44 +01:00
parent 5ebcd15558
commit 8833a62f82
3 changed files with 10 additions and 22 deletions
+1 -1
View File
@@ -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_Branch = "master";
var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
var da_lss_adis_time = new Date().getTime(); var da_lss_adis_time = new Date().getTime();
+3 -9
View File
@@ -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 * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -18431,7 +18431,7 @@
Check_Call_Police_Active() { Check_Call_Police_Active() {
let self = this; 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 //TODO: check if Verband or Event and
// Maybe done with //__FIXX__20192 // Maybe done with //__FIXX__20192
self.Collect_Jails(); self.Collect_Jails();
@@ -18640,7 +18640,7 @@
} }
}); });
} }
}
if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) { if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) {
$('#mission_alarm_btn').click(); $('#mission_alarm_btn').click();
} else { } else {
@@ -18649,12 +18649,6 @@
tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`); 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);
self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`);
});
}
} }
} }
+2 -8
View File
@@ -632,7 +632,7 @@
Check_Call_Police_Active() { Check_Call_Police_Active() {
let self = this; 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 //TODO: check if Verband or Event and
// Maybe done with //__FIXX__20192 // Maybe done with //__FIXX__20192
self.Collect_Jails(); self.Collect_Jails();
@@ -841,7 +841,7 @@
} }
}); });
} }
}
if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) { if ($('#vehicle_show_table_all input[type="checkbox"]:checked').length > 0) {
$('#mission_alarm_btn').click(); $('#mission_alarm_btn').click();
} else { } else {
@@ -850,12 +850,6 @@
tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`); 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);
self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`);
});
}
} }
} }