From aa861bef79ac150e5c5369694c4752f87f0e69d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ou=C5=A1ek?= <brousek@ics.muni.cz> Date: Sat, 24 Sep 2022 18:57:42 +0200 Subject: [PATCH] style: prettier --- www/resources/campus-idp-muni.js | 2 +- www/resources/campus-idp.js | 368 ++++++++++++++++--------------- www/resources/privacyidea.js | 40 ++-- 3 files changed, 207 insertions(+), 203 deletions(-) diff --git a/www/resources/campus-idp-muni.js b/www/resources/campus-idp-muni.js index 3312dbd..a67c935 100644 --- a/www/resources/campus-idp-muni.js +++ b/www/resources/campus-idp-muni.js @@ -1,3 +1,3 @@ document.addEventListener("DOMContentLoaded", function () { - App.run({}); + App.run({}); }); diff --git a/www/resources/campus-idp.js b/www/resources/campus-idp.js index fa28f84..75f2a8f 100644 --- a/www/resources/campus-idp.js +++ b/www/resources/campus-idp.js @@ -1,207 +1,211 @@ import dialogPolyfill from "dialog-polyfill"; function hideElement(element) { - element.classList.add("vhide", "d-none"); + element.classList.add("vhide", "d-none"); } function showElement(element) { - element.classList.remove("vhide", "d-none"); + element.classList.remove("vhide", "d-none"); } function showMoreOptions(showButton) { - document - .getElementById(showButton.dataset.targetform) - .querySelectorAll(".idp-hidden") - .forEach(showElement); - hideElement(showButton); + document + .getElementById(showButton.dataset.targetform) + .querySelectorAll(".idp-hidden") + .forEach(showElement); + hideElement(showButton); } function selectizeScore() { - return function () { - return 1; - }; + return function () { + return 1; + }; } function selectizeRenderOption(item, escape) { - var escapedText = escape(item.text); - var escapedImage = escape(item.image); - - var is_muni_framework = document.body.classList.contains("framework_muni"); - - if (is_muni_framework) { - return ( - '<div class="box-vcards-list__item box-vcard--compact searchbox-result u-pr-0 u-pl-0">' + - '<div class="box-vcards-list__inner u-pr-0 u-pl-0">' + - '<p class="box-vcards-list__img center">' + - '<img src="' + - escapedImage + - '" class="img-searchbox" alt=""/>' + - "</p>" + - '<div class="box-vcards-list__content u-pb-0 u-pt-0 u-pr-0 u-pl-10">' + - escapedText + - "</div>" + - "</div>" + - "</div>" - ); - } else { - return ( - '<div class="list-group-item list-group-item-action d-flex align-items-center">' + - '<p class="mb-0">' + - '<img src="' + - escapedImage + - '" class="img-searchbox" alt=""/>' + - "</p>" + - '<div class="margin-left-24">' + - escapedText + - "</div>" + - "</div>" - ); - } + var escapedText = escape(item.text); + var escapedImage = escape(item.image); + + var is_muni_framework = document.body.classList.contains("framework_muni"); + + if (is_muni_framework) { + return ( + '<div class="box-vcards-list__item box-vcard--compact searchbox-result u-pr-0 u-pl-0">' + + '<div class="box-vcards-list__inner u-pr-0 u-pl-0">' + + '<p class="box-vcards-list__img center">' + + '<img src="' + + escapedImage + + '" class="img-searchbox" alt=""/>' + + "</p>" + + '<div class="box-vcards-list__content u-pb-0 u-pt-0 u-pr-0 u-pl-10">' + + escapedText + + "</div>" + + "</div>" + + "</div>" + ); + } else { + return ( + '<div class="list-group-item list-group-item-action d-flex align-items-center">' + + '<p class="mb-0">' + + '<img src="' + + escapedImage + + '" class="img-searchbox" alt=""/>' + + "</p>" + + '<div class="margin-left-24">' + + escapedText + + "</div>" + + "</div>" + ); + } } function selectizeOnChange(value) { - $(this["$input"]).closest("form").trigger("submit"); + $(this["$input"]).closest("form").trigger("submit"); } function selectizeLoad(query, callback) { - if (!query.length) { - return callback(); - } - - this.clearCache("option"); - this.clearOptions(); - this.refreshOptions(true); - - $.ajax({ - url: "./idpSearch.php", - type: "GET", - dataType: "json", - data: { - q: query, - index: this.settings.myIndex, - idphint: this.settings.idphint, - aarc_discovery_hint: this.settings.aarcDiscoveryHint, - aarc_discovery_hint_uri: this.settings.aarcDiscoveryHintUri, - language: document.documentElement.getAttribute("lang"), - page_limit: 10, - }, - error: function () { - callback(); - }, - success: function (res) { - callback(res.items); - }, - }); + if (!query.length) { + return callback(); + } + + this.clearCache("option"); + this.clearOptions(); + this.refreshOptions(true); + + $.ajax({ + url: "./idpSearch.php", + type: "GET", + dataType: "json", + data: { + q: query, + index: this.settings.myIndex, + idphint: this.settings.idphint, + aarc_discovery_hint: this.settings.aarcDiscoveryHint, + aarc_discovery_hint_uri: this.settings.aarcDiscoveryHintUri, + language: document.documentElement.getAttribute("lang"), + page_limit: 10, + }, + error: function () { + callback(); + }, + success: function (res) { + callback(res.items); + }, + }); } document.addEventListener("DOMContentLoaded", function () { - // show dialog after the specified timeout to refresh the page - const dialog = document.getElementById("refresh-required-dialog"); - if (dialog && dialog.dataset.timeout) { - dialogPolyfill.registerDialog(dialog); - setTimeout(() => { - dialog.showModal(); - }, dialog.dataset.timeout * 1000); - } - - var moreOptions = document.querySelectorAll(".more-options"); - if (moreOptions) { - moreOptions.forEach(function (showButton) { - showButton.addEventListener( - "click", - showMoreOptions.bind(null, showButton) - ); - }); - } - - var password = document.getElementById("password"); - var togglePassword = document.getElementById("toggle-password"); - if (password && togglePassword) { - password.addEventListener("keyup", function (event) { - var message = document.getElementById("capslock-warning"); - var wrapper = document.getElementById("capslock-warning-wrapper"); - var isCapsLock = event.getModifierState("CapsLock"); - if (isCapsLock) { - showElement(message); - } else { - hideElement(message); - } - if (wrapper) { - wrapper.classList.toggle("warning", isCapsLock); - } - }); - - togglePassword.addEventListener("click", function () { - var type = - password.getAttribute("type") === "password" ? "text" : "password"; - password.setAttribute("type", type); - - this.classList.toggle("icon-eye-slash"); - this.querySelector("i").classList.toggle("fa-eye"); - this.querySelector("i").classList.toggle("fa-eye-slash"); - }); - } - - document.querySelectorAll(".remove-option").forEach(function (element) { - element.addEventListener("click", function (e) { - e.stopPropagation(); - - let button = this.parentElement.parentElement; - - $.ajax({ - url: "./removeCookie.php", - type: "POST", - data: { - entityid: button.value, - }, - }); - - button.remove(); - }); - }); - - document.querySelectorAll(".idps-form-nojs-div").forEach(hideElement); - document.querySelectorAll(".idps-form-div").forEach(showElement); - - var indexes = JSON.parse( - document.querySelector('meta[name="searchbox-indexes"]').content - ); - var placeholderTexts = JSON.parse( - document.querySelector('meta[name="searchbox-placeholders"]').content - ); - var defaultPlaceholder = document.querySelector( - 'meta[name="searchbox-default"]' - ).content; - var is_muni_framework = document.body.classList.contains("framework_muni"); - indexes.forEach(function (index) { - $("#searchbox-" + index).selectize({ - valueField: "idpentityid", - labelField: "text", - options: [], - create: false, - maxItems: 1, - myIndex: index, - idphint: JSON.parse( - document.querySelector('meta[name="idphint"]').content - ), - aarcDiscoveryHint: document.querySelector('meta[name="aarc_discovery_hint"]').content, - aarcDiscoveryHintUri: document.querySelector('meta[name="aarc_discovery_hint_uri"]').content, - loadThrottle: 250, - placeholder: placeholderTexts[index] ?? defaultPlaceholder, - render: { - option: selectizeRenderOption, - }, - onChange: selectizeOnChange, - score: selectizeScore, - load: selectizeLoad, - }); - if (is_muni_framework) { - $("#searchbox-" + index + "-selectized").after( - '<span class="icon icon-search"></span>' - ); - $("#searchbox-" + index + "-selectized") - .parent() - .addClass("inp-fix inp-icon inp-icon--after"); - } - }); + // show dialog after the specified timeout to refresh the page + const dialog = document.getElementById("refresh-required-dialog"); + if (dialog && dialog.dataset.timeout) { + dialogPolyfill.registerDialog(dialog); + setTimeout(() => { + dialog.showModal(); + }, dialog.dataset.timeout * 1000); + } + + var moreOptions = document.querySelectorAll(".more-options"); + if (moreOptions) { + moreOptions.forEach(function (showButton) { + showButton.addEventListener( + "click", + showMoreOptions.bind(null, showButton) + ); + }); + } + + var password = document.getElementById("password"); + var togglePassword = document.getElementById("toggle-password"); + if (password && togglePassword) { + password.addEventListener("keyup", function (event) { + var message = document.getElementById("capslock-warning"); + var wrapper = document.getElementById("capslock-warning-wrapper"); + var isCapsLock = event.getModifierState("CapsLock"); + if (isCapsLock) { + showElement(message); + } else { + hideElement(message); + } + if (wrapper) { + wrapper.classList.toggle("warning", isCapsLock); + } + }); + + togglePassword.addEventListener("click", function () { + var type = + password.getAttribute("type") === "password" ? "text" : "password"; + password.setAttribute("type", type); + + this.classList.toggle("icon-eye-slash"); + this.querySelector("i").classList.toggle("fa-eye"); + this.querySelector("i").classList.toggle("fa-eye-slash"); + }); + } + + document.querySelectorAll(".remove-option").forEach(function (element) { + element.addEventListener("click", function (e) { + e.stopPropagation(); + + let button = this.parentElement.parentElement; + + $.ajax({ + url: "./removeCookie.php", + type: "POST", + data: { + entityid: button.value, + }, + }); + + button.remove(); + }); + }); + + document.querySelectorAll(".idps-form-nojs-div").forEach(hideElement); + document.querySelectorAll(".idps-form-div").forEach(showElement); + + var indexes = JSON.parse( + document.querySelector('meta[name="searchbox-indexes"]').content + ); + var placeholderTexts = JSON.parse( + document.querySelector('meta[name="searchbox-placeholders"]').content + ); + var defaultPlaceholder = document.querySelector( + 'meta[name="searchbox-default"]' + ).content; + var is_muni_framework = document.body.classList.contains("framework_muni"); + indexes.forEach(function (index) { + $("#searchbox-" + index).selectize({ + valueField: "idpentityid", + labelField: "text", + options: [], + create: false, + maxItems: 1, + myIndex: index, + idphint: JSON.parse( + document.querySelector('meta[name="idphint"]').content + ), + aarcDiscoveryHint: document.querySelector( + 'meta[name="aarc_discovery_hint"]' + ).content, + aarcDiscoveryHintUri: document.querySelector( + 'meta[name="aarc_discovery_hint_uri"]' + ).content, + loadThrottle: 250, + placeholder: placeholderTexts[index] ?? defaultPlaceholder, + render: { + option: selectizeRenderOption, + }, + onChange: selectizeOnChange, + score: selectizeScore, + load: selectizeLoad, + }); + if (is_muni_framework) { + $("#searchbox-" + index + "-selectized").after( + '<span class="icon icon-search"></span>' + ); + $("#searchbox-" + index + "-selectized") + .parent() + .addClass("inp-fix inp-icon inp-icon--after"); + } + }); }); diff --git a/www/resources/privacyidea.js b/www/resources/privacyidea.js index a684e10..b30eefe 100644 --- a/www/resources/privacyidea.js +++ b/www/resources/privacyidea.js @@ -1,27 +1,27 @@ const closeMessage = (e) => { - e.target.parentElement.classList.add("hide"); - e.preventDefault(); - return false; + e.target.parentElement.classList.add("hide"); + e.preventDefault(); + return false; }; document.addEventListener("DOMContentLoaded", () => { - // close buttons - document.querySelectorAll(".message__close").forEach((closeButton) => { - closeButton.addEventListener("click", closeMessage); - }); + // close buttons + document.querySelectorAll(".message__close").forEach((closeButton) => { + closeButton.addEventListener("click", closeMessage); + }); - // allow WebAuthn and OTP on one page - ["otp", "submitButton"].forEach((id) => { - const el = document.getElementById(id); - if (el) { - el.classList.remove("hidden"); - } - }); + // allow WebAuthn and OTP on one page + ["otp", "submitButton"].forEach((id) => { + const el = document.getElementById(id); + if (el) { + el.classList.remove("hidden"); + } + }); - const piLoginForm = document.getElementById("piLoginForm"); - if (piLoginForm) { - piLoginForm.addEventListener("submit", () => { - document.getElementById("mode").value = "otp"; - }); - } + const piLoginForm = document.getElementById("piLoginForm"); + if (piLoginForm) { + piLoginForm.addEventListener("submit", () => { + document.getElementById("mode").value = "otp"; + }); + } }); -- GitLab