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

v2 up handler ADisSettings = ADSettings

Browse Source
This commit is contained in:
Josef Fröhle
2018-12-02 09:52:22 +01:00
parent bbcb0039c2
commit 74a1be28de
3 changed files with 20 additions and 24 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:Sun Dec 02 2018 09:49:44 GMT+0100 (CET)*/ /*Generated on:Sun Dec 02 2018 09:52: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
+4 -6
View File
@@ -1,4 +1,4 @@
/*Generated on:Sun Dec 02 2018 09:49:44 GMT+0100 (CET)*/ /*Generated on:Sun Dec 02 2018 09:52:21 GMT+0100 (CET)*/
/* /*
* Dexie.js - a minimalistic wrapper for IndexedDB * Dexie.js - a minimalistic wrapper for IndexedDB
* =============================================== * ===============================================
@@ -18276,7 +18276,7 @@ class AutomaticDispose {
} }
console.log("MissionID", self.MissionID); console.log("MissionID", self.MissionID);
console.log("MissionType", self.MissionType); console.log("MissionType", self.MissionType);
self.ADisSettings().then((setting) => { self.ADSettings().then((setting) => {
if (setting[runnerSettings] != 'true') { if (setting[runnerSettings] != 'true') {
return self.ADisDB.ADisMissionsOwn.where({ return self.ADisDB.ADisMissionsOwn.where({
missionID: self.MissionID, missionID: self.MissionID,
@@ -18332,7 +18332,7 @@ class AutomaticDispose {
WorkVerbandMission() { WorkVerbandMission() {
const self = this; const self = this;
self.ADisSettings().then((setting) => { self.ADSettings().then((setting) => {
var title = document.getElementById('missionH1'); var title = document.getElementById('missionH1');
var isVerband = title.innerText.toLowerCase().includes("[verband]"); var isVerband = title.innerText.toLowerCase().includes("[verband]");
if (setting['Alliance-Automatic'] == 'true' && isVerband) { if (setting['Alliance-Automatic'] == 'true' && isVerband) {
@@ -18393,13 +18393,11 @@ class AutomaticDispose {
var missionLoad; var missionLoad;
if (window.name == 'adis-ownmissions') { if (window.name == 'adis-ownmissions') {
setOpt = 'MissionsOwn-Automatic'; setOpt = 'MissionsOwn-Automatic';
missionLoad = 'ADisMissionsOwn';
} else if (window.name == 'adis-krankentransporte') { } else if (window.name == 'adis-krankentransporte') {
setOpt = 'Krankentransport-Automatic'; setOpt = 'Krankentransport-Automatic';
missionLoad = 'ADisKrankentransport';
} }
if (setOpt && missionLoad) { if (setOpt && missionLoad) {
self.ADisSettings().then((setting) => { self.ADSettings().then((setting) => {
if (setting[setOpt] == 'true') { if (setting[setOpt] == 'true') {
var coll = self.ADisDB.ADisMissions.where({ var coll = self.ADisDB.ADisMissions.where({
done: 'false' done: 'false'
src/autoloaderV2.js
+3 -5
View File
@@ -1106,7 +1106,7 @@ class AutomaticDispose {
} }
console.log("MissionID", self.MissionID); console.log("MissionID", self.MissionID);
console.log("MissionType", self.MissionType); console.log("MissionType", self.MissionType);
self.ADisSettings().then((setting) => { self.ADSettings().then((setting) => {
if (setting[runnerSettings] != 'true') { if (setting[runnerSettings] != 'true') {
return self.ADisDB.ADisMissionsOwn.where({ return self.ADisDB.ADisMissionsOwn.where({
missionID: self.MissionID, missionID: self.MissionID,
@@ -1162,7 +1162,7 @@ class AutomaticDispose {
WorkVerbandMission() { WorkVerbandMission() {
const self = this; const self = this;
self.ADisSettings().then((setting) => { self.ADSettings().then((setting) => {
var title = document.getElementById('missionH1'); var title = document.getElementById('missionH1');
var isVerband = title.innerText.toLowerCase().includes("[verband]"); var isVerband = title.innerText.toLowerCase().includes("[verband]");
if (setting['Alliance-Automatic'] == 'true' && isVerband) { if (setting['Alliance-Automatic'] == 'true' && isVerband) {
@@ -1223,13 +1223,11 @@ class AutomaticDispose {
var missionLoad; var missionLoad;
if (window.name == 'adis-ownmissions') { if (window.name == 'adis-ownmissions') {
setOpt = 'MissionsOwn-Automatic'; setOpt = 'MissionsOwn-Automatic';
missionLoad = 'ADisMissionsOwn';
} else if (window.name == 'adis-krankentransporte') { } else if (window.name == 'adis-krankentransporte') {
setOpt = 'Krankentransport-Automatic'; setOpt = 'Krankentransport-Automatic';
missionLoad = 'ADisKrankentransport';
} }
if (setOpt && missionLoad) { if (setOpt && missionLoad) {
self.ADisSettings().then((setting) => { self.ADSettings().then((setting) => {
if (setting[setOpt] == 'true') { if (setting[setOpt] == 'true') {
var coll = self.ADisDB.ADisMissions.where({ var coll = self.ADisDB.ADisMissions.where({
done: 'false' done: 'false'