Jomaar/automatic-dispose
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e903quß

Browse Source
This commit is contained in:
Josef Fröhle
2018-11-24 19:37:46 +01:00
parent 36f8a8c8b4
commit e64cc11f6d
3 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/autoloader.js
Vendored
+33 -31
View File
@@ -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_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();
@@ -4990,7 +4990,6 @@ ADisDB.on("ready", () => {
return ADisDB.ADisMissionsOwn.where({ return ADisDB.ADisMissionsOwn.where({
done: 'false' done: 'false'
}).and(function (item) { }).and(function (item) {
console.log('ADis_OpenNextOwnMissions: filter', item);
return item.next_check <= Math.floor(new Date().getTime() / 1000) return item.next_check <= Math.floor(new Date().getTime() / 1000)
}).limit(1) }).limit(1)
} }
@@ -5015,7 +5014,7 @@ ADisDB.on("ready", () => {
// TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");");
$("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty"); $("#adis-ownmissions-frame").attr("mission_id", "empty");
setTimeout(ADis_OpenNextOwnMissions,100); setTimeout(ADis_OpenNextOwnMissions, 100);
}, 5000); }, 5000);
} else { } else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission') console.log('ADis_OpenNextOwnMissions: no free slot for mission')
@@ -5044,7 +5043,7 @@ ADisDB.on("ready", () => {
} }
return Missions.count(function (count) { return Missions.count(function (count) {
if (count > 0) { if (count > 0) {
return Missions.each((Mission) => { return Missions.each(() => {
var MissionElement = $("#mission_" + ID); var MissionElement = $("#mission_" + ID);
var _MissionID = MissionElement.attr("mission_id"); var _MissionID = MissionElement.attr("mission_id");
@@ -5053,20 +5052,21 @@ ADisDB.on("ready", () => {
var MissionName = addr[0]; var MissionName = addr[0];
var MissionStreet = addr[1]; var MissionStreet = addr[1];
var MissionVillage = addr[2]; var MissionVillage = addr[2];
return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
return ADisDB.ADisAvailabelMissions.get({ return ADisDB.ADisAvailabelMissions.get({
type: MissionType type: MissionType
}).then((available) => { }).then((available) => {
return ADis_AddMissionToQueue({ return ADis_AddMissionToQueue({
"id": _MissionID, "id": _MissionID,
"type": _MissionType, "type": _MissionType,
"name": MissionName, "name": MissionName,
"street": MissionStreet, "street": MissionStreet,
"village": MissionVillage, "village": MissionVillage,
"available": (available !== undefined), "available": (available !== undefined),
"done": false, "done": false,
"last_check": Math.floor(new Date().getTime() / 1000), "last_check": Math.floor(new Date().getTime() / 1000),
"next_check": Math.floor(new Date().getTime() / 1000) + 1 "next_check": Math.floor(new Date().getTime() / 1000) + 1
});
}); });
}); });
}); });
@@ -5080,19 +5080,21 @@ ADisDB.on("ready", () => {
var MissionStreet = addr[1]; var MissionStreet = addr[1];
var MissionVillage = addr[2]; var MissionVillage = addr[2];
return ADisDB.ADisAvailabelMissions.get({ return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
type: MissionType return ADisDB.ADisAvailabelMissions.get({
}).then((available) => { type: MissionType
return ADis_AddMissionToQueue({ }).then((available) => {
"id": MissionID, return ADis_AddMissionToQueue({
"type": MissionType, "id": MissionID,
"name": MissionName, "type": MissionType,
"street": MissionStreet, "name": MissionName,
"village": MissionVillage, "street": MissionStreet,
"available": (available !== undefined), "village": MissionVillage,
"done": false, "available": (available !== undefined),
"last_check": Math.floor(new Date().getTime() / 1000), "done": false,
"next_check": Math.floor(new Date().getTime() / 1000) + 1 "last_check": Math.floor(new Date().getTime() / 1000),
"next_check": Math.floor(new Date().getTime() / 1000) + 1
});
}); });
}); });
} }
dist/standalone.js
Vendored
+1 -1
View File
@@ -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) { function includesString(string1, string2) {
return string1.toLowerCase().includes(string2.toLowerCase()); return string1.toLowerCase().includes(string2.toLowerCase());
} }
script/mission/opener-ownmission.js
+32 -30
View File
@@ -64,7 +64,6 @@ function ADis_OpenNextOwnMissions() {
return ADisDB.ADisMissionsOwn.where({ return ADisDB.ADisMissionsOwn.where({
done: 'false' done: 'false'
}).and(function (item) { }).and(function (item) {
console.log('ADis_OpenNextOwnMissions: filter', item);
return item.next_check <= Math.floor(new Date().getTime() / 1000) return item.next_check <= Math.floor(new Date().getTime() / 1000)
}).limit(1) }).limit(1)
} }
@@ -89,7 +88,7 @@ function ADis_OpenNextOwnMissions() {
// TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");"); // TODO: tellParent("ADisMissionDone(" + window.name + "," + MissionID + ");");
$("#adis-ownmissions-frame").attr("src", ""); $("#adis-ownmissions-frame").attr("src", "");
$("#adis-ownmissions-frame").attr("mission_id", "empty"); $("#adis-ownmissions-frame").attr("mission_id", "empty");
setTimeout(ADis_OpenNextOwnMissions,100); setTimeout(ADis_OpenNextOwnMissions, 100);
}, 5000); }, 5000);
} else { } else {
console.log('ADis_OpenNextOwnMissions: no free slot for mission') 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) { return Missions.count(function (count) {
if (count > 0) { if (count > 0) {
return Missions.each((Mission) => { return Missions.each(() => {
var MissionElement = $("#mission_" + ID); var MissionElement = $("#mission_" + ID);
var _MissionID = MissionElement.attr("mission_id"); var _MissionID = MissionElement.attr("mission_id");
@@ -127,20 +126,21 @@ window.ADis_AddMission = function ADis_AddMission(ID) {
var MissionName = addr[0]; var MissionName = addr[0];
var MissionStreet = addr[1]; var MissionStreet = addr[1];
var MissionVillage = addr[2]; var MissionVillage = addr[2];
return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
return ADisDB.ADisAvailabelMissions.get({ return ADisDB.ADisAvailabelMissions.get({
type: MissionType type: MissionType
}).then((available) => { }).then((available) => {
return ADis_AddMissionToQueue({ return ADis_AddMissionToQueue({
"id": _MissionID, "id": _MissionID,
"type": _MissionType, "type": _MissionType,
"name": MissionName, "name": MissionName,
"street": MissionStreet, "street": MissionStreet,
"village": MissionVillage, "village": MissionVillage,
"available": (available !== undefined), "available": (available !== undefined),
"done": false, "done": false,
"last_check": Math.floor(new Date().getTime() / 1000), "last_check": Math.floor(new Date().getTime() / 1000),
"next_check": Math.floor(new Date().getTime() / 1000) + 1 "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 MissionStreet = addr[1];
var MissionVillage = addr[2]; var MissionVillage = addr[2];
return ADisDB.ADisAvailabelMissions.get({ return ADisDB.transaction('rw', [ADisDB.ADisMissionsOwn, ADisDB.ADisSettings, ADisDB.ADisAvailabelMissions], () => {
type: MissionType return ADisDB.ADisAvailabelMissions.get({
}).then((available) => { type: MissionType
return ADis_AddMissionToQueue({ }).then((available) => {
"id": MissionID, return ADis_AddMissionToQueue({
"type": MissionType, "id": MissionID,
"name": MissionName, "type": MissionType,
"street": MissionStreet, "name": MissionName,
"village": MissionVillage, "street": MissionStreet,
"available": (available !== undefined), "village": MissionVillage,
"done": false, "available": (available !== undefined),
"last_check": Math.floor(new Date().getTime() / 1000), "done": false,
"next_check": Math.floor(new Date().getTime() / 1000) + 1 "last_check": Math.floor(new Date().getTime() / 1000),
"next_check": Math.floor(new Date().getTime() / 1000) + 1
});
}); });
}); });
} }