update with some fixes

This commit is contained in:
2019-02-20 00:03:02 +01:00
parent 2fffc9e024
commit 7f347ae32c
3 changed files with 9382 additions and 9350 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
/*Generated on:Tue Feb 19 2019 17:58:25 GMT+0100 (CET)*/ /*Generated on:Wed Feb 20 2019 00:03:01 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();
+410 -394
View File
File diff suppressed because it is too large Load Diff
+28 -12
View File
@@ -1,11 +1,11 @@
//=require ../node_modules/dexie/dist/dexie.js //=require ../node_modules/dexie/dist/dexie.js
// Helper Scripts // Helper Scripts
String.prototype.replaceAll = function (find, replace) { String.prototype.replaceAll = function (find, replace) {
return this.replace(new RegExp(find.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1"), "g"), replace); return this.replace(new RegExp(find.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1"), "g"), replace);
} }
class AutomaticDisposeFaye { class AutomaticDisposeFaye {
constructor(myFaye) { constructor(myFaye) {
let self = this; let self = this;
if (typeof myFaye === 'undefined') { if (typeof myFaye === 'undefined') {
@@ -66,9 +66,14 @@
// 977642907 // 977642907
// console.log('mission_participation_add', JSON.stringify(id)) // console.log('mission_participation_add', JSON.stringify(id))
} }
missionFinish(id) {
// 977642907
// console.log('mission_participation_add', JSON.stringify(id))
}
missionDelete(id) { missionDelete(id) {
// 976896964 // 976896964
// console.log('missionDelete', JSON.stringify(id)) // console.log('missionDelete', JSON.stringify(id))
window.AutomaticDisposeCall.RemoveMissionsFromQueue(String(id));
} }
missionInvolved(id, bool) { missionInvolved(id, bool) {
// 977642907, true // 977642907, true
@@ -123,6 +128,14 @@
} }
// console.log('missionMarkerAdd', JSON.stringify(data)) // console.log('missionMarkerAdd', JSON.stringify(data))
} }
prisonerDelete(id) {
// 527339744
// console.log('patientDelete', JSON.stringify(id))
}
patientFinish(id) {
// 527339744
// console.log('patientDelete', JSON.stringify(id))
}
patientDelete(id) { patientDelete(id) {
// 527339744 // 527339744
// console.log('patientDelete', JSON.stringify(id)) // console.log('patientDelete', JSON.stringify(id))
@@ -152,9 +165,9 @@
// {"bulkInsert":false,"id":12299183,"b":3426848,"fms":5,"fms_real":5,"c":"[BS] DRK 40-83-11 (RTW)","t":28} // {"bulkInsert":false,"id":12299183,"b":3426848,"fms":5,"fms_real":5,"c":"[BS] DRK 40-83-11 (RTW)","t":28}
//console.log('vehicleMarkerAdd', JSON.stringify(data)) //console.log('vehicleMarkerAdd', JSON.stringify(data))
} }
} }
class AutomaticDispose { class AutomaticDispose {
// Variablen // Variablen
get ADisSettings() { get ADisSettings() {
@@ -640,7 +653,7 @@
let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
// console.log('Check_Call_Police_Active', MissionID) // console.log('Check_Call_Police_Active', MissionID)
self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
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);`);
}); });
} }
} }
@@ -804,7 +817,7 @@
//__FIXX__20192 //__FIXX__20192
let me = $(elem).find('td:nth-child(5) > a:contains("Jomaar")').length; let me = $(elem).find('td:nth-child(5) > a:contains("Jomaar")').length;
let me2 = $(elem).find('td:nth-child(7) > a:contains("Jomaar")').length; let me2 = $(elem).find('td:nth-child(7) > a:contains("Jomaar")').length;
if (me+me2 > 0) { if (me + me2 > 0) {
//__FIXX__20192 //__FIXX__20192
var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id")); var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id"));
if (CalledVehicleID == 52) { if (CalledVehicleID == 52) {
@@ -840,7 +853,7 @@
} else { } else {
let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1); let MissionID = document.location.pathname.substr(document.location.pathname.lastIndexOf("/") + 1);
self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => { self.RemovePoliceSprechwunschFromQueue(MissionID).then((deleteCount) => {
tellParent(`console.log('sprechwunsch:${window.name}:${MissionID}');setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`); tellParent(`/*console.log('sprechwunsch-no-action:${window.name}:${MissionID}');*/setTimeout(function(){ window.AutomaticDisposeCall.FreeIframe('adis-sprechwunsch-police-frame');},500);`);
}); });
} }
} }
@@ -2643,8 +2656,8 @@
return NeedMoreVehicles; return NeedMoreVehicles;
} }
} }
try {
$(document).ready(function () { $(document).ready(function () {
var $div = $("a.missing_vehicles_load:contains('Fahrzeuganzeige begrenzt! Fehlende Fahrzeuge laden!')"); var $div = $("a.missing_vehicles_load:contains('Fahrzeuganzeige begrenzt! Fehlende Fahrzeuge laden!')");
//var isHidden = $div.is(':hidden'); //var isHidden = $div.is(':hidden');
@@ -2691,3 +2704,6 @@
window.AutomaticDisposeCall = new AutomaticDispose(window.faye); window.AutomaticDisposeCall = new AutomaticDispose(window.faye);
} }
}); });
} catch (e){
console.error("Error %s\nLocation: %o", e.stack, window.location)
}