From 48721c85ebcfa973ee81719d2467ca80e4253dc9 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 01 May 2026 17:30:03 +0000
Subject: [PATCH] =Edmonton Ink hard test begins! Real testing of the managers and reset routes will commence. So far, just ensuring our classes are all loaded correctly: Site() and its sub-classes Membership, Login, etc. Care should be taken to load conditionally on 'init', as we finish defining most settings by 'plugins_loaded' at priority 5
---
assets/js/concise/UtilityFunctions.js | 82 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/assets/js/concise/UtilityFunctions.js b/assets/js/concise/UtilityFunctions.js
index df3c75d..2731174 100644
--- a/assets/js/concise/UtilityFunctions.js
+++ b/assets/js/concise/UtilityFunctions.js
@@ -413,30 +413,40 @@
}
}
-window.prefixInput = function(input, prefix, replace = false) {
+window.prefixInput = function(input, prefix, wrapper = null, replace = false, name = false) {
if (!input) {
console.warn('prefixInput called with null/undefined input');
return;
}
- let newId = replace ? prefix : `${prefix}${input.name}`;
- if (input.labels && input.labels.length > 0) {
- input.labels?.forEach(label => {
- label.htmlFor = newId;
- });
- } else if (input.previousElementSibling?.tagName === 'label') {
- let label = input.previousElementSibling;
- if (label) label.htmlFor = newId;
- } else if (input.nextElementSibling?.tagName === 'label') {
- let label = input.nextElementSibling;
- if (label) label.htmlFor = newId;
- }else {
- let label = input.closest('[data-field]')?.querySelector(`label[for="${input.id}"]`);
- if (label) {
- label.htmlFor = newId;
- }
+ const oldId = input.id;
+ const newId = replace ? prefix : `${prefix}${input.name}`;
+
+ // Search for label within wrapper if provided, otherwise use existing logic
+ let label = null;
+
+ if (wrapper) {
+ // Most reliable: search within wrapper by old ID
+ label = wrapper.querySelector(`label[for="${oldId}"]`);
+ } else if (input.labels && input.labels.length > 0) {
+ // Fallback to input.labels if no wrapper provided
+ label = input.labels[0];
+ } else if (input.previousElementSibling?.tagName === 'LABEL') {
+ label = input.previousElementSibling;
+ } else if (input.nextElementSibling?.tagName === 'LABEL') {
+ label = input.nextElementSibling;
+ } else {
+ // Final fallback: search up the tree
+ label = input.closest('[data-field]')?.querySelector(`label[for="${oldId}"]`);
+ }
+
+ if (label) {
+ label.htmlFor = newId;
}
input.id = newId;
+ if (name) {
+ input.name = newId;
+ }
}
/**
@@ -885,6 +895,9 @@
return ui;
}
+window.sleep = async function (ms = 50) {
+ return new Promise(resolve => setTimeout(resolve, ms));
+};
class DebouncedActions {
constructor() {
@@ -987,3 +1000,38 @@
updateMaxScroll();
updateScrollProgress(lastY);
+
+
+window.decodeHTMLEntities = function(text) {
+ if (!window.decodeHelper) {
+ window.decodeHelper = document.createElement('textarea');
+ }
+
+ window.decodeHelper.innerHTML = text;
+ return window.decodeHelper.value;
+}
+
+
+window.focusNextElement = function() {
+ //add all elements we want to include in our selection
+ var focussableElements =
+ 'a:not([disabled]), button:not([disabled]), input[type=text]:not([disabled]), [tabindex]:not([disabled]):not([tabindex="-1"])';
+ if (document.activeElement && document.activeElement.form) {
+ var focussable = Array.prototype.filter.call(
+ document.activeElement.form.querySelectorAll(focussableElements),
+ function (element) {
+ //check for visibility while always include the current activeElement
+ return (
+ element.offsetWidth > 0 ||
+ element.offsetHeight > 0 ||
+ element === document.activeElement
+ );
+ }
+ );
+ var index = focussable.indexOf(document.activeElement);
+ if (index > -1) {
+ var nextElement = focussable[index + 1] || focussable[0];
+ nextElement.focus();
+ }
+ }
+}
--
Gitblit v1.10.0