From 6005336fb22b27fa3c16e42c44c52b7053fbb3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Wed, 13 Feb 2019 18:17:11 +0100 Subject: [PATCH] debug sprechwunsch police --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 6 +++--- src/autoloaderV2.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index a5c3fcc..d6dee06 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Feb 13 2019 18:00:52 GMT+0100 (CET)*/ +/*Generated on:Wed Feb 13 2019 18:17: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 ae0b69e..e216cc7 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Feb 13 2019 18:00:52 GMT+0100 (CET)*/ +/*Generated on:Wed Feb 13 2019 18:17:11 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18151,7 +18151,7 @@ self.ADisDB.ADisSprechwunschPolice.where({ done: 'false' }).each((myWunsch) => { - if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) { + if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g) && ($('#mission_panel_' + myWunsch.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + myWunsch.missionID).hasClass('mission_panel_yellow'))) { $("#mission_" + myWunsch.missionID).remove(); return self.RemovePoliceSprechwunschFromQueue(myWunsch.missionID); } @@ -18160,7 +18160,7 @@ }).then(() => { var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible'); return MOIODOS.each((_, elem) => { - if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) { + if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g) && $('#mission_panel_' + myWunsch.missionID).hasClass('mission_panel_greenmission_panel_red')) { var MissionID = $(elem).attr("mission_id"); self.AddPoliceSprechwunschToQueue(MissionID); } diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index e4789dc..4842662 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -395,7 +395,7 @@ self.ADisDB.ADisSprechwunschPolice.where({ done: 'false' }).each((myWunsch) => { - if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) { + if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g) && ($('#mission_panel_' + myWunsch.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + myWunsch.missionID).hasClass('mission_panel_yellow'))) { $("#mission_" + myWunsch.missionID).remove(); return self.RemovePoliceSprechwunschFromQueue(myWunsch.missionID); } @@ -404,7 +404,7 @@ }).then(() => { var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible'); return MOIODOS.each((_, elem) => { - if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) { + if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g) && $('#mission_panel_' + myWunsch.missionID).hasClass('mission_panel_greenmission_panel_red')) { var MissionID = $(elem).attr("mission_id"); self.AddPoliceSprechwunschToQueue(MissionID); }