From e64cc11f6d725a2d27d3b9cd33fc7d317475d9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Sat, 24 Nov 2018 19:37:46 +0100 Subject: [PATCH] =?UTF-8?q?e903qu=C3=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/autoloader.js | 64 +++++++++++++++-------------- dist/standalone.js | 2 +- script/mission/opener-ownmission.js | 62 ++++++++++++++-------------- 3 files changed, 66 insertions(+), 62 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 0bd9ec1..d779840 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 19:32:19 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 19:37:45 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(); @@ -4990,7 +4990,6 @@ ADisDB.on("ready", () => { return ADisDB.ADisMissionsOwn.where({ done: 'false' }).and(function (item) { - console.log('ADis_OpenNextOwnMissions: filter', item); return item.next_check <= Math.floor(new Date().getTime() / 1000) }).limit(1) } @@ -5015,7 +5014,7 @@ ADisDB.on("ready", () => { // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); $("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("mission_id", "empty"); - setTimeout(ADis_OpenNextOwnMissions,100); + setTimeout(ADis_OpenNextOwnMissions, 100); }, 5000); } else { console.log('ADis_OpenNextOwnMissions: no free slot for mission') @@ -5044,7 +5043,7 @@ ADisDB.on("ready", () => { } return Missions.count(function (count) { if (count > 0) { - return Missions.each((Mission) => { + return Missions.each(() => { var MissionElement = $("#mission_" + ID); var _MissionID = MissionElement.attr("mission_id"); @@ -5053,20 +5052,21 @@ ADisDB.on("ready", () => { var MissionName = addr[0]; var MissionStreet = addr[1]; var MissionVillage = addr[2]; - - return ADisDB.ADisAvailabelMissions.get({ - type: MissionType - }).then((available) => { - return ADis_AddMissionToQueue({ - "id": _MissionID, - "type": _MissionType, - "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 + return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { + return ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return ADis_AddMissionToQueue({ + "id": _MissionID, + "type": _MissionType, + "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 + }); }); }); }); @@ -5080,19 +5080,21 @@ ADisDB.on("ready", () => { var MissionStreet = addr[1]; var MissionVillage = addr[2]; - return ADisDB.ADisAvailabelMissions.get({ - type: MissionType - }).then((available) => { - return ADis_AddMissionToQueue({ - "id": MissionID, - "type": MissionType, - "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 + return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { + return ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return ADis_AddMissionToQueue({ + "id": MissionID, + "type": MissionType, + "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 + }); }); }); } diff --git a/dist/standalone.js b/dist/standalone.js index d1be32b..cb80822 100644 --- a/dist/standalone.js +++ b/dist/standalone.js @@ -1,4 +1,4 @@ -/*Generated on:Sat Nov 24 2018 19:32:19 GMT+0100 (CET)*/ +/*Generated on:Sat Nov 24 2018 19:37:45 GMT+0100 (CET)*/ function includesString(string1, string2) { return string1.toLowerCase().includes(string2.toLowerCase()); } diff --git a/script/mission/opener-ownmission.js b/script/mission/opener-ownmission.js index 81ddd9d..2ee5ac8 100644 --- a/script/mission/opener-ownmission.js +++ b/script/mission/opener-ownmission.js @@ -64,7 +64,6 @@ function ADis_OpenNextOwnMissions() { return ADisDB.ADisMissionsOwn.where({ done: 'false' }).and(function (item) { - console.log('ADis_OpenNextOwnMissions: filter', item); return item.next_check <= Math.floor(new Date().getTime() / 1000) }).limit(1) } @@ -89,7 +88,7 @@ function ADis_OpenNextOwnMissions() { // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); $("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("mission_id", "empty"); - setTimeout(ADis_OpenNextOwnMissions,100); + setTimeout(ADis_OpenNextOwnMissions, 100); }, 5000); } else { console.log('ADis_OpenNextOwnMissions: no free slot for mission') @@ -118,7 +117,7 @@ window.ADis_AddMission = function ADis_AddMission(ID) { } return Missions.count(function (count) { if (count > 0) { - return Missions.each((Mission) => { + return Missions.each(() => { var MissionElement = $("#mission_" + ID); var _MissionID = MissionElement.attr("mission_id"); @@ -127,20 +126,21 @@ window.ADis_AddMission = function ADis_AddMission(ID) { var MissionName = addr[0]; var MissionStreet = addr[1]; var MissionVillage = addr[2]; - - return ADisDB.ADisAvailabelMissions.get({ - type: MissionType - }).then((available) => { - return ADis_AddMissionToQueue({ - "id": _MissionID, - "type": _MissionType, - "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 + return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { + return ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return ADis_AddMissionToQueue({ + "id": _MissionID, + "type": _MissionType, + "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 + }); }); }); }); @@ -154,19 +154,21 @@ window.ADis_AddMission = function ADis_AddMission(ID) { var MissionStreet = addr[1]; var MissionVillage = addr[2]; - return ADisDB.ADisAvailabelMissions.get({ - type: MissionType - }).then((available) => { - return ADis_AddMissionToQueue({ - "id": MissionID, - "type": MissionType, - "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 + return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => { + return ADisDB.ADisAvailabelMissions.get({ + type: MissionType + }).then((available) => { + return ADis_AddMissionToQueue({ + "id": MissionID, + "type": MissionType, + "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 + }); }); }); }