From ed8ace38768e05fa4f18b3185ec80dab10267ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Mon, 17 Dec 2018 17:38:19 +0100 Subject: [PATCH] v2 uapg09iv09ajo --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 75 ++++++++++++++++++++++---------------------- src/autoloaderV2.js | 73 +++++++++++++++++++++--------------------- 3 files changed, 76 insertions(+), 74 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 2c378c0..594b0e8 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Dec 17 2018 17:33:04 GMT+0100 (CET)*/ +/*Generated on:Mon Dec 17 2018 17:38:18 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 0a3e7ab..53c1abf 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Dec 17 2018 17:33:04 GMT+0100 (CET)*/ +/*Generated on:Mon Dec 17 2018 17:38:18 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -18610,51 +18610,52 @@ class AutomaticDispose { var MissionStreet = addr[1]; var MissionVillage = addr[2]; - return self.ADisDB.ADisAvailabelMissions.get({ - type: _MissionType - }).then((available) => { - return self.AddMissionsToQueue({ - "id": _MissionID, - "type": _MissionType, - "runner": MyMission.runner, - "name": MissionName, - "street": MissionStreet, - "village": MissionVillage, - "available": MyMission.available, - "done": MyMission.done, - "last_check": MyMission.last_check, - "next_check": MyMission.next_check + if (MissionElement.length) { + return self.ADisDB.ADisAvailabelMissions.get({ + type: _MissionType + }).then((available) => { + return self.UpdateMissions({ + "id": _MissionID, + "type": _MissionType, + "runner": MyMission.runner, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": MyMission.available, + "done": MyMission.done, + "last_check": MyMission.last_check, + "next_check": MyMission.next_check + }); + }); - - }); - + } }); } else { var MissionElement = $("#mission_" + ID); - var MissionID = MissionElement.attr("mission_id"); var MissionType = MissionElement.attr("mission_type_id"); var addr = MissionElement.find(".map_position_mover").text().split(",") var MissionName = addr[0]; var MissionStreet = addr[1]; var MissionVillage = addr[2]; - - return self.ADisDB.ADisAvailabelMissions.get({ - type: MissionType - }).then((available) => { - return self.AddMissionsToQueue({ - "id": MissionID, - "type": MissionType, - "runner": runnerOpt, - "name": MissionName, - "street": MissionStreet, - "village": MissionVillage, - "available": (available !== undefined), - "done": false, - "last_check": Math.floor(new Date().getTime() / 1000), - "next_check": Math.floor(new Date().getTime() / 1000) + 1 + if (MissionElement.length) { + return self.ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return self.UpdateMissions({ + "id": MissionID, + "type": MissionType, + "runner": runnerOpt, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined), + "done": false, + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + }); }); - }); + } } }); @@ -19004,7 +19005,7 @@ class AutomaticDispose { return self.ADisDB.ADisAvailabelMissions.get({ type: MissionType.toString() }).then((availableMission) => { - if (availableMission != undefined){ + if (availableMission != undefined) { if (availableMission.jsondata) { self.MissionConfig = availableMission.jsondata; // console.log('MissionConfig: ', MissionType.toString(), JSON.stringify(self.MissionConfig, null, 2)) @@ -19086,7 +19087,7 @@ class AutomaticDispose { setTimeout(function () { var $div = $("#mission-form > div:nth-child(7) > a"); var isShow = $div.is(':hidden'); - console.log ($div, isShow); + console.log($div, isShow); if ($div.length && isShow) { var observer = new MutationObserver(function (mutations) { mutations.forEach(function (mutation) { diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 46b58dd..f992f9e 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -950,51 +950,52 @@ class AutomaticDispose { var MissionStreet = addr[1]; var MissionVillage = addr[2]; - return self.ADisDB.ADisAvailabelMissions.get({ - type: _MissionType - }).then((available) => { - return self.AddMissionsToQueue({ - "id": _MissionID, - "type": _MissionType, - "runner": MyMission.runner, - "name": MissionName, - "street": MissionStreet, - "village": MissionVillage, - "available": MyMission.available, - "done": MyMission.done, - "last_check": MyMission.last_check, - "next_check": MyMission.next_check + if (MissionElement.length) { + return self.ADisDB.ADisAvailabelMissions.get({ + type: _MissionType + }).then((available) => { + return self.UpdateMissions({ + "id": _MissionID, + "type": _MissionType, + "runner": MyMission.runner, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": MyMission.available, + "done": MyMission.done, + "last_check": MyMission.last_check, + "next_check": MyMission.next_check + }); + }); - - }); - + } }); } else { var MissionElement = $("#mission_" + ID); - var MissionID = MissionElement.attr("mission_id"); var MissionType = MissionElement.attr("mission_type_id"); var addr = MissionElement.find(".map_position_mover").text().split(",") var MissionName = addr[0]; var MissionStreet = addr[1]; var MissionVillage = addr[2]; - - return self.ADisDB.ADisAvailabelMissions.get({ - type: MissionType - }).then((available) => { - return self.AddMissionsToQueue({ - "id": MissionID, - "type": MissionType, - "runner": runnerOpt, - "name": MissionName, - "street": MissionStreet, - "village": MissionVillage, - "available": (available !== undefined), - "done": false, - "last_check": Math.floor(new Date().getTime() / 1000), - "next_check": Math.floor(new Date().getTime() / 1000) + 1 + if (MissionElement.length) { + return self.ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return self.UpdateMissions({ + "id": MissionID, + "type": MissionType, + "runner": runnerOpt, + "name": MissionName, + "street": MissionStreet, + "village": MissionVillage, + "available": (available !== undefined), + "done": false, + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + }); }); - }); + } } }); @@ -1344,7 +1345,7 @@ class AutomaticDispose { return self.ADisDB.ADisAvailabelMissions.get({ type: MissionType.toString() }).then((availableMission) => { - if (availableMission != undefined){ + if (availableMission != undefined) { if (availableMission.jsondata) { self.MissionConfig = availableMission.jsondata; // console.log('MissionConfig: ', MissionType.toString(), JSON.stringify(self.MissionConfig, null, 2)) @@ -1426,7 +1427,7 @@ class AutomaticDispose { setTimeout(function () { var $div = $("#mission-form > div:nth-child(7) > a"); var isShow = $div.is(':hidden'); - console.log ($div, isShow); + console.log($div, isShow); if ($div.length && isShow) { var observer = new MutationObserver(function (mutations) { mutations.forEach(function (mutation) {