From 0cb7cfde4bbcd432eedca5c0dcdbec0288276aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Sat, 24 Nov 2018 16:06:23 +0100 Subject: [PATCH] afa --- dist/autoloader.js | 34 ++++++++-------------------- dist/standalone.js | 2 +- script/sprechwunsch/police-opener.js | 17 ++++---------- script/sprechwunsch/rescue-opener.js | 15 +++--------- 4 files changed, 18 insertions(+), 50 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 5e05429..b60a00a 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 16:01:15 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 16:06:22 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(); @@ -6351,18 +6351,9 @@ ADisDB.on("ready", () => { function ADis_CollectRescueSprechwuensche() { ADisDB.ADisSprechwunsch.where({ done: 'false' - }).then((Wunsch) => { - if (Wunsch !== undefined) { - return Wunsch.count(function (count) { - if (count > 0) { - return Wunsch.each((myWunsch) => { - if ($("#vehicle_list_" + myWunsch.vehicleID).find(".building_list_fms").text() != "5") { - return ADis_RemoveRescueSprechwunschFromQueue(myWunsch.vehicleID); - } - }) - - } - }) + }).each((myWunsch) => { + if ($("#vehicle_list_" + myWunsch.vehicleID).find(".building_list_fms").text() != "5") { + return ADis_RemoveRescueSprechwunschFromQueue(myWunsch.vehicleID); } }).then(() => { $("#building_list").find(".building_list_vehicle_element").each(function () { @@ -6436,18 +6427,10 @@ ADisDB.on("ready", () => { function ADis_CollectPoliceSprechwuensche() { ADisDB.ADisSprechwunschPolice.where({ done: 'false' - }).then((Wunsch) => { - if (Wunsch !== undefined) { - return Wunsch.count(function (count) { - if (count > 0) { - return Wunsch.each((myWunsch) => { - if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) { - $("#mission_" + myWunsch.missionID).remove(); - return ADis_RemovePoliceSprechwunschFromQueue(myWunsch.missionID); - } - }); - } - }) + }).each((myWunsch) => { + if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) { + $("#mission_" + myWunsch.missionID).remove(); + return ADis_RemovePoliceSprechwunschFromQueue(myWunsch.missionID); } }).then(() => { var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible'); @@ -6470,6 +6453,7 @@ ADisDB.on("ready", () => { }).limit(1) } }).then((Wunsch) => { + console.log(Wunsch, typeof Wunsch); if (Wunsch !== undefined) { Wunsch.each((myWunsch) => { console.log(myWunsch, typeof myWunsch); diff --git a/dist/standalone.js b/dist/standalone.js index b873142..d3a5254 100644 --- a/dist/standalone.js +++ b/dist/standalone.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 16:01:15 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 16:06:22 GMT+0100 (CET)*/ function includesString(string1, string2) { return string1.toLowerCase().includes(string2.toLowerCase()); } diff --git a/script/sprechwunsch/police-opener.js b/script/sprechwunsch/police-opener.js index 94038e8..e780a5e 100755 --- a/script/sprechwunsch/police-opener.js +++ b/script/sprechwunsch/police-opener.js @@ -15,18 +15,10 @@ $(document).ready(function () { function ADis_CollectPoliceSprechwuensche() { ADisDB.ADisSprechwunschPolice.where({ done: 'false' - }).then((Wunsch) => { - if (Wunsch !== undefined) { - return Wunsch.count(function (count) { - if (count > 0) { - return Wunsch.each((myWunsch) => { - if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) { - $("#mission_" + myWunsch.missionID).remove(); - return ADis_RemovePoliceSprechwunschFromQueue(myWunsch.missionID); - } - }); - } - }) + }).each((myWunsch) => { + if (!$("#mission_" + myWunsch.missionID).text().match(/Gefangene sollen abtransportiert werden/g)) { + $("#mission_" + myWunsch.missionID).remove(); + return ADis_RemovePoliceSprechwunschFromQueue(myWunsch.missionID); } }).then(() => { var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible'); @@ -49,6 +41,7 @@ function ADis_OpenNextPoliceSprechwunsch() { }).limit(1) } }).then((Wunsch) => { + console.log(Wunsch, typeof Wunsch); if (Wunsch !== undefined) { Wunsch.each((myWunsch) => { console.log(myWunsch, typeof myWunsch); diff --git a/script/sprechwunsch/rescue-opener.js b/script/sprechwunsch/rescue-opener.js index 6387445..7aa3882 100755 --- a/script/sprechwunsch/rescue-opener.js +++ b/script/sprechwunsch/rescue-opener.js @@ -13,18 +13,9 @@ $(document).ready(function () { function ADis_CollectRescueSprechwuensche() { ADisDB.ADisSprechwunsch.where({ done: 'false' - }).then((Wunsch) => { - if (Wunsch !== undefined) { - return Wunsch.count(function (count) { - if (count > 0) { - return Wunsch.each((myWunsch) => { - if ($("#vehicle_list_" + myWunsch.vehicleID).find(".building_list_fms").text() != "5") { - return ADis_RemoveRescueSprechwunschFromQueue(myWunsch.vehicleID); - } - }) - - } - }) + }).each((myWunsch) => { + if ($("#vehicle_list_" + myWunsch.vehicleID).find(".building_list_fms").text() != "5") { + return ADis_RemoveRescueSprechwunschFromQueue(myWunsch.vehicleID); } }).then(() => { $("#building_list").find(".building_list_vehicle_element").each(function () {