From 95f8d2a15991429a046596a5c085fda2605b0c72 Mon Sep 17 00:00:00 2001 From: Zankaria Date: Thu, 6 Feb 2025 00:00:10 +0100 Subject: [PATCH 1/4] main.js: remove init style chooser --- templates/main.js | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/templates/main.js b/templates/main.js index d86d5b70..c48a6ed3 100755 --- a/templates/main.js +++ b/templates/main.js @@ -231,28 +231,6 @@ var resourceVersion = document.currentScript.getAttribute('data-resource-version {% endif %} {% raw %} -function initStyleChooser() { - var newElement = document.createElement('div'); - newElement.className = 'styles'; - - for (styleName in styles) { - if (styleName) { - var style = document.createElement('a'); - style.innerHTML = '[' + styleName + ']'; - style.onclick = function() { - changeStyle(this.innerHTML.substring(1, this.innerHTML.length - 1), this); - }; - if (styleName == selectedstyle) { - style.className = 'selected'; - } - style.href = 'javascript:void(0);'; - newElement.appendChild(style); - } - } - - document.getElementById('bottom-hud').before(newElement); -} - function getCookie(cookie_name) { let results = document.cookie.match('(^|;) ?' + cookie_name + '=([^;]*)(;|$)'); if (results) { @@ -528,7 +506,6 @@ var script_settings = function(script_name) { }; function init() { - initStyleChooser(); initCaptcha(); {% endraw %} From cd2a99f5430a59cdc74bd61d9daf9378e404a2cb Mon Sep 17 00:00:00 2001 From: Zankaria Date: Thu, 6 Feb 2025 00:00:29 +0100 Subject: [PATCH 2/4] style-select-simple.js: add simple style selector back in --- js/style-select-simple.js | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 js/style-select-simple.js diff --git a/js/style-select-simple.js b/js/style-select-simple.js new file mode 100644 index 00000000..8b59fa0a --- /dev/null +++ b/js/style-select-simple.js @@ -0,0 +1,36 @@ +/* + * style-select-simple.js + * + * Changes the stylesheet chooser links to a ').css({float:"none"}); - var options = []; - - var i = 1; + let stylesDiv = $('div.styles'); + let pages = $('div.pages'); + let stylesSelect = $('').css({float:"none"}); + let options = []; + + let i = 1; stylesDiv.children().each(function() { - var name = this.innerHTML.replace(/(^\[|\]$)/g, ''); - var opt = $('') + let name = this.innerHTML.replace(/(^\[|\]$)/g, ''); + let opt = $('') .html(name) .val(i); - if ($(this).hasClass('selected')) + if ($(this).hasClass('selected')) { opt.attr('selected', true); - options.push ([name.toUpperCase (), opt]); + } + options.push([name.toUpperCase (), opt]); $(this).attr('id', 'style-select-' + i); i++; }); - options.sort ((a, b) => { + options.sort((a, b) => { const keya = a [0]; const keyb = b [0]; - if (keya < keyb) { return -1; } - if (keya > keyb) { return 1; } + if (keya < keyb) { + return -1; + } + if (keya > keyb) { + return 1; + } return 0; - }).forEach (([key, opt]) => { + }).forEach(([key, opt]) => { stylesSelect.append(opt); }); - + stylesSelect.change(function() { $('#style-select-' + $(this).val()).click(); }); - - stylesDiv.hide() + + stylesDiv.hide(); pages.after( $('
') .append(_('Select theme: '), stylesSelect) From 12be74304a2727a09ed5de3c72bb1aca2b371cab Mon Sep 17 00:00:00 2001 From: Zankaria Date: Thu, 6 Feb 2025 00:52:22 +0100 Subject: [PATCH 4/4] style-select.js: adapt js --- js/style-select.js | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/js/style-select.js b/js/style-select.js index 54370fba..16bbae72 100644 --- a/js/style-select.js +++ b/js/style-select.js @@ -14,24 +14,24 @@ */ $(document).ready(function() { - let stylesDiv = $('div.styles'); let pages = $('div.pages'); let stylesSelect = $('').css({float:"none"}); let options = []; let i = 1; - stylesDiv.children().each(function() { - let name = this.innerHTML.replace(/(^\[|\]$)/g, ''); - let opt = $('') - .html(name) - .val(i); - if ($(this).hasClass('selected')) { - opt.attr('selected', true); + for (styleName in styles) { + if (styleName) { + let opt = $('') + .html(styleName) + .val(i); + if (selectedstyle == styleName) { + opt.attr('selected', true); + } + opt.attr('id', 'style-select-' + i); + options.push([styleName.toUpperCase (), opt]); + i++; } - options.push([name.toUpperCase (), opt]); - $(this).attr('id', 'style-select-' + i); - i++; - }); + } options.sort((a, b) => { const keya = a [0]; @@ -48,10 +48,11 @@ $(document).ready(function() { }); stylesSelect.change(function() { - $('#style-select-' + $(this).val()).click(); + let sel = $(this).find(":selected")[0]; + let styleName = sel.innerHTML; + changeStyle(styleName, sel); }); - stylesDiv.hide(); pages.after( $('
') .append(_('Select theme: '), stylesSelect)