diff --git a/modules/core/www/assets/js/loginuserpass.js b/modules/core/www/assets/js/loginuserpass.js index 6685cd43ac2dbe04528b8be6044f4d44bcf30eb9..b61a0911eeddcf6acfaf707dc3e0ac787853cd3a 100644 --- a/modules/core/www/assets/js/loginuserpass.js +++ b/modules/core/www/assets/js/loginuserpass.js @@ -1,12 +1,12 @@ ready(function () { - // your code here - var button = document.getElementById("submit_button"); - button.onclick = function () { - this.innerHTML = button.getAttribute("data-processing");; - this.disabled = true; + // your code here + var button = document.getElementById("submit_button"); + button.onclick = function () { + this.innerHTML = button.getAttribute("data-processing");; + this.disabled = true; - var form = document.getElementById("f"); - form.submit(); - return true; - }; + var form = document.getElementById("f"); + form.submit(); + return true; + }; }); diff --git a/src/js/bundle.js b/src/js/bundle.js index ffd3a8ef2fccfd5f8fe1aece8fdca59877b3272b..e58ca0ba5ee984c01ff9285f78088864eb35975c 100644 --- a/src/js/bundle.js +++ b/src/js/bundle.js @@ -7,14 +7,16 @@ import php from "highlight.js/lib/languages/php"; import json from "highlight.js/lib/languages/json"; window.readyHandlers = []; -window.ready = function ready(handler) { +window.ready = function ready(handler) +{ window.readyHandlers.push(handler); handleState(); }; -window.handleState = function handleState () { +window.handleState = function handleState() +{ if (document.readyState === 'interactive' || document.readyState === "complete") { - while(window.readyHandlers.length > 0) { + while (window.readyHandlers.length > 0) { (window.readyHandlers.shift())(); } } @@ -25,7 +27,7 @@ document.onreadystatechange = window.handleState; ready(function () { // Language selector var languageSelector = document.getElementById("language-selector"); - languageSelector.onchange = function() { + languageSelector.onchange = function () { let languageForm = document.getElementById("language-form"); languageForm.submit(); return true; @@ -34,7 +36,7 @@ ready(function () { // Side menu var menuLink = document.getElementById("menuLink"); - menuLink.onclick = function(e) { + menuLink.onclick = function (e) { e.preventDefault(); let layout = document.getElementById("layout"); @@ -62,16 +64,17 @@ ready(function () { // Expander boxes var expandable = document.querySelectorAll('.expandable > .expander'); expandable.forEach(function (currentValue, index, arr) { - currentValue.onclick = function(e) { + currentValue.onclick = function (e) { e.preventDefault(); + var parent = e.currentTarget.parentNode; + if (parent.className.match(/(?:^|\s)expanded(?!\S)/)) { + parent.className = parent.className.replace(/(?:^|\s)expanded(?!\S)/g , ''); + } else { + parent.className += " expanded"; + } - if (parent.className.match(/(?:^|\s)expanded(?!\S)/)) { - parent.className = parent.className.replace(/(?:^|\s)expanded(?!\S)/g , ''); - } else { - parent.className += " expanded"; - } - e.currentTarget.blur(); + e.currentTarget.blur(); } });