diff --git a/dist/autoloader.js b/dist/autoloader.js index d66c06f..961a74c 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Feb 20 2019 00:40:34 GMT+0100 (CET)*/ +/*Generated on:Wed Feb 20 2019 00:52:06 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 8df56a3..bf1665a 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Wed Feb 20 2019 00:40:34 GMT+0100 (CET)*/ +/*Generated on:Wed Feb 20 2019 00:52:06 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -19671,10 +19671,9 @@ class AutomaticDispose { }) .then(() => { - if (self.OweSecure && $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:checked').length == 0) { + if (self.MyRunner == 'os' && self.OweSecure && $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:checked').length == 0) { if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:not(:checked)').length > 0) { $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:not(:checked)')[0].click(); - return; } } @@ -19686,7 +19685,7 @@ class AutomaticDispose { //tellParent(`console.log('ok:${window.name}:${self.MissionID}');`); if (vhcalled.length == 0) { //window.console.log('nocars selected...', vhcalled.length); - if (window.name == 'adis-krankentransporte') { + if (self.MyRunner == 'kt') { //window.console.log('nocars selected... select KTW'); $('#aao_2753841').click(); window.$('#mission_alarm_btn').click(); @@ -19695,9 +19694,17 @@ class AutomaticDispose { tellParent(`/*console.log('nocars:${window.name}:${self.MissionID}');*/window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); } } else { - tellParent(`/*console.log('sendcars:${window.name}:${self.MissionID}');*/setTimeout(function(){window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');},1000);`); - window.$('#mission_alarm_btn').click(); - //window.console.log("WILL KLICK SEND3", self.MissionID, window.name) + if (self.MyRunner == 'os' && self.OweSecure) { + tellParent(`/*console.log('sendcars:${window.name}:${self.MissionID}');*/setTimeout(function(){window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');},1000);`); + window.$('#mission_alarm_btn').click(); + } else if (self.MyRunner == 'os' && !self.OweSecure) { + tellParent(`/*console.log('sendcars:${window.name}:${self.MissionID}');*/setTimeout(function(){window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');},1000);`); + window.$('#container_navbar_alarm > div > div.navbar-header > div:nth-child(3) > a.btn.btn-success.btn-sm.alert_next_alliance.hidden-xs').click(); + } else { + tellParent(`/*console.log('sendcars:${window.name}:${self.MissionID}');*/setTimeout(function(){window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');},1000);`); + window.$('#mission_alarm_btn').click(); + //window.console.log("WILL KLICK SEND3", self.MissionID, window.name) + } } }); }) diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 81f54f5..258b449 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -1638,10 +1638,9 @@ class AutomaticDispose { }) .then(() => { - if (self.OweSecure && $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:checked').length == 0) { + if (self.MyRunner == 'os' && self.OweSecure && $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:checked').length == 0) { if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:not(:checked)').length > 0) { $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]:not(:checked)')[0].click(); - return; } } @@ -1653,7 +1652,7 @@ class AutomaticDispose { //tellParent(`console.log('ok:${window.name}:${self.MissionID}');`); if (vhcalled.length == 0) { //window.console.log('nocars selected...', vhcalled.length); - if (window.name == 'adis-krankentransporte') { + if (self.MyRunner == 'kt') { //window.console.log('nocars selected... select KTW'); $('#aao_2753841').click(); window.$('#mission_alarm_btn').click(); @@ -1662,9 +1661,17 @@ class AutomaticDispose { tellParent(`/*console.log('nocars:${window.name}:${self.MissionID}');*/window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); } } else { - tellParent(`/*console.log('sendcars:${window.name}:${self.MissionID}');*/setTimeout(function(){window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');},1000);`); - window.$('#mission_alarm_btn').click(); - //window.console.log("WILL KLICK SEND3", self.MissionID, window.name) + if (self.MyRunner == 'os' && self.OweSecure) { + tellParent(`/*console.log('sendcars:${window.name}:${self.MissionID}');*/setTimeout(function(){window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');},1000);`); + window.$('#mission_alarm_btn').click(); + } else if (self.MyRunner == 'os' && !self.OweSecure) { + tellParent(`/*console.log('sendcars:${window.name}:${self.MissionID}');*/setTimeout(function(){window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');},1000);`); + window.$('#container_navbar_alarm > div > div.navbar-header > div:nth-child(3) > a.btn.btn-success.btn-sm.alert_next_alliance.hidden-xs').click(); + } else { + tellParent(`/*console.log('sendcars:${window.name}:${self.MissionID}');*/setTimeout(function(){window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');},1000);`); + window.$('#mission_alarm_btn').click(); + //window.console.log("WILL KLICK SEND3", self.MissionID, window.name) + } } }); })