Removed last changes from using vufind.el

LuomaJuha · Dec 12, 2024 · 91b2a0e · 91b2a0e
1 parent 2c109b2
commit 91b2a0e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 26 deletions.
diff --git a/themes/bootstrap3/js/search.js b/themes/bootstrap3/js/search.js
@@ -288,17 +288,11 @@ VuFind.register('search', function search() {
     recordList.classList.add('loading');
     const history = recordList.dataset.history;
 
-    const loadingOverlay = VuFind.el(
-      'div',
-      {
-        class: 'loading-overlay',
-        'aria-live': 'polite',
-        'role': 'status'
-      },
-      [
-        VuFind.loadingElement(),
-      ]
-    );
+    const loadingOverlay = document.createElement('div');
+    loadingOverlay.classList = 'loading-overlay';
+    loadingOverlay.setAttribute('aria-live', 'polite');
+    loadingOverlay.setAttribute('role', 'status');
+    loadingOverlay.append(VuFind.loadingElement());
     recordList.prepend(loadingOverlay);
     scrollToResults();
     const searchStats = document.querySelector(searchStatsSelector);

diff --git a/themes/bootstrap3/templates/combined/results-list.phtml b/themes/bootstrap3/templates/combined/results-list.phtml
@@ -54,8 +54,10 @@
           count = count.toLocaleString();
           const spanText = document.createTextNode();
           spanText.textContent = '(' + count + ')';
-          const recordTotalSpan = VuFind.el('span', {class: 'record-total'}, [spanText]);
-          link.append(recordTotalSpan);
+          const totalSpan = document.createElement('span');
+          totalSpan.className = 'record-total';
+          totalSpan.append(spanText);
+          link.append(totalSpan);
           link.style.display = "inline";
           combinedJumpLinks.style.visibility = "inherit";
         }

diff --git a/themes/bootstrap5/js/search.js b/themes/bootstrap5/js/search.js
@@ -288,17 +288,11 @@ VuFind.register('search', function search() {
     recordList.classList.add('loading');
     const history = recordList.dataset.history;
 
-    const loadingOverlay = VuFind.el(
-      'div',
-      {
-        class: 'loading-overlay',
-        'aria-live': 'polite',
-        'role': 'status'
-      },
-      [
-        VuFind.loadingElement(),
-      ]
-    );
+    const loadingOverlay = document.createElement('div');
+    loadingOverlay.classList = 'loading-overlay';
+    loadingOverlay.setAttribute('aria-live', 'polite');
+    loadingOverlay.setAttribute('role', 'status');
+    loadingOverlay.append(VuFind.loadingElement());
     recordList.prepend(loadingOverlay);
     scrollToResults();
     const searchStats = document.querySelector(searchStatsSelector);

diff --git a/themes/bootstrap5/templates/combined/results-list.phtml b/themes/bootstrap5/templates/combined/results-list.phtml
@@ -54,8 +54,10 @@
           count = count.toLocaleString();
           const spanText = document.createTextNode();
           spanText.textContent = '(' + count + ')';
-          const recordTotalSpan = VuFind.el('span', {class: 'record-total'}, [spanText]);
-          link.append(recordTotalSpan);
+          const totalSpan = document.createElement('span');
+          totalSpan.className = 'record-total';
+          totalSpan.append(spanText);
+          link.append(totalSpan);
           link.style.display = "inline";
           combinedJumpLinks.style.visibility = "inherit";
         }