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

fix problem with Planned Events

Browse Source
This commit is contained in:
Josef Fröhle
2019-02-20 19:56:21 +01:00
parent c7400e3a93
commit 15f1444021
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/autoloader.js
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
/*Generated on:Wed Feb 20 2019 14:42:18 GMT+0100 (CET)*/ /*Generated on:Wed Feb 20 2019 19:56:21 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();
dist/autoloaderV2.js
Vendored
+3 -3
View File
@@ -1,4 +1,4 @@
/*Generated on:Wed Feb 20 2019 14:42:18 GMT+0100 (CET)*/ /*Generated on:Wed Feb 20 2019 19:56:21 GMT+0100 (CET)*/
/* /*
* Dexie.js - a minimalistic wrapper for IndexedDB * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -19148,7 +19148,7 @@ class AutomaticDispose {
if (count > 0) { if (count > 0) {
return Missions.each((MyMission) => { return Missions.each((MyMission) => {
var MissionElement = $("#mission_" + MyMission.missionID); var MissionElement = $("#mission_" + MyMission.missionID);
if ((MissionElement.length == 0 || MissionElement.text().match(/Gefangene sollen abtransportiert werden/g) || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) && MyMission.runner != 'os') { if ((MissionElement.length == 0 || MissionElement.text().match(/Gefangene sollen abtransportiert werden/g) || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) /*&& MyMission.runner != 'os'*/) {
// remove // remove
//console.log("Remove :", MyMission) //console.log("Remove :", MyMission)
self.RemoveMissionsFromQueue(MyMission.missionID) self.RemoveMissionsFromQueue(MyMission.missionID)
@@ -19501,7 +19501,7 @@ class AutomaticDispose {
} */ } */
else { else {
setTimeout(function () { setTimeout(function () {
if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) { if (['adis-ownmissions', /*'adis-plannedevents',*/ 'adis-krankentransporte'].indexOf(window.name) != -1) {
//console.log("DEBUG:::::: WILL SEND?", window.name, self.MissionID) //console.log("DEBUG:::::: WILL SEND?", window.name, self.MissionID)
self.CheckMissionAutomatic(); self.CheckMissionAutomatic();
} else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) {
src/autoloaderV2.js
+2 -2
View File
@@ -1115,7 +1115,7 @@ class AutomaticDispose {
if (count > 0) { if (count > 0) {
return Missions.each((MyMission) => { return Missions.each((MyMission) => {
var MissionElement = $("#mission_" + MyMission.missionID); var MissionElement = $("#mission_" + MyMission.missionID);
if ((MissionElement.length == 0 || MissionElement.text().match(/Gefangene sollen abtransportiert werden/g) || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) && MyMission.runner != 'os') { if ((MissionElement.length == 0 || MissionElement.text().match(/Gefangene sollen abtransportiert werden/g) || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_green') || $('#mission_panel_' + MyMission.missionID).hasClass('mission_panel_yellow')) /*&& MyMission.runner != 'os'*/) {
// remove // remove
//console.log("Remove :", MyMission) //console.log("Remove :", MyMission)
self.RemoveMissionsFromQueue(MyMission.missionID) self.RemoveMissionsFromQueue(MyMission.missionID)
@@ -1468,7 +1468,7 @@ class AutomaticDispose {
} */ } */
else { else {
setTimeout(function () { setTimeout(function () {
if (['adis-ownmissions', 'adis-plannedevents', 'adis-krankentransporte'].indexOf(window.name) != -1) { if (['adis-ownmissions', /*'adis-plannedevents',*/ 'adis-krankentransporte'].indexOf(window.name) != -1) {
//console.log("DEBUG:::::: WILL SEND?", window.name, self.MissionID) //console.log("DEBUG:::::: WILL SEND?", window.name, self.MissionID)
self.CheckMissionAutomatic(); self.CheckMissionAutomatic();
} else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) { } else if (['adis-verbandmission', 'adis-verbandmission-event'].indexOf(window.name) != -1) {