diff options
author | Simon Rettberg | 2019-04-01 17:38:04 +0200 |
---|---|---|
committer | Simon Rettberg | 2019-04-01 17:38:04 +0200 |
commit | b63ccc136cdbb128f5dc6272497e7c9e32ff449c (patch) | |
tree | e454f5f640e740fb540a84958155fab1e36b8a56 | |
parent | [serversetup-bwlp-ipxe] imgfree on localboot (diff) | |
download | slx-admin-b63ccc136cdbb128f5dc6272497e7c9e32ff449c.tar.gz slx-admin-b63ccc136cdbb128f5dc6272497e7c9e32ff449c.tar.xz slx-admin-b63ccc136cdbb128f5dc6272497e7c9e32ff449c.zip |
[main] Incorporate taskmanager callbacks into slx-fixes.js
-rw-r--r-- | index.php | 2 | ||||
-rw-r--r-- | modules-available/main/templates/tm-callback-trigger.html | 15 | ||||
-rw-r--r-- | script/slx-fixes.js | 17 |
3 files changed, 17 insertions, 17 deletions
@@ -232,7 +232,5 @@ if (CONFIG_DEBUG) { . round(Database::getQueryTime(), 3) . 's query time total'), 'main'); } -Render::addTemplate('tm-callback-trigger', array(), 'main'); - // Send page to client. Render::output(); diff --git a/modules-available/main/templates/tm-callback-trigger.html b/modules-available/main/templates/tm-callback-trigger.html deleted file mode 100644 index cd03a1fe..00000000 --- a/modules-available/main/templates/tm-callback-trigger.html +++ /dev/null @@ -1,15 +0,0 @@ -<script type="text/javascript"> - var slxCbCooldown = 0; - function slxCheckCallbacks() { - $.post('api.php?do=cb', { token: TOKEN }, function(data) { - if ( data.indexOf('True') >= 0 ) { - slxCbCooldown = 0; - } else { - slxCbCooldown++; - } - if (slxCbCooldown < 4) - setTimeout(slxCheckCallbacks, (slxCbCooldown + 1) * 1500); - }, 'text'); - } - document.addEventListener("DOMContentLoaded", slxCheckCallbacks, false); -</script>
\ No newline at end of file diff --git a/script/slx-fixes.js b/script/slx-fixes.js index 925ac44f..29f52449 100644 --- a/script/slx-fixes.js +++ b/script/slx-fixes.js @@ -87,3 +87,20 @@ $(document).ready(function() { }; $('button[data-confirm]').click($function); }); + +// Taskmanager callbacks for running tasks +$(document).ready(function() { + var slxCbCooldown = 0; + function slxCheckCallbacks() { + $.post('api.php?do=cb', { token: TOKEN }, function(data) { + if ( data.indexOf('True') >= 0 ) { + slxCbCooldown += 1; + } else { + slxCbCooldown += 10; + } + if (slxCbCooldown < 30) + setTimeout(slxCheckCallbacks, slxCbCooldown * 1000); + }, 'text'); + } + slxCheckCallbacks(); +}); |