Merge branch 'dev' into eliminate-laminas-dom

demiankatz · Dec 9, 2024 · 87a5521 · 87a5521
2 parents ff3d498 + affb132
commit 87a5521
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -43,7 +43,6 @@
         "laminas/laminas-cache-storage-adapter-memory": "^2.0",
         "laminas/laminas-captcha": "2.17.0",
         "laminas/laminas-code": "4.14.0",
-        "laminas/laminas-config": "3.9.0",
         "laminas/laminas-db": "2.20.0",
         "laminas/laminas-diactoros": "3.5.0",
         "laminas/laminas-escaper": "2.13.0",

diff --git a/composer.lock b/composer.lock
diff --git a/themes/bootstrap3/js/combined-search.js b/themes/bootstrap3/js/combined-search.js
@@ -4,15 +4,14 @@ VuFind.combinedSearch = (function CombinedSearch() {
   function init(container, url) {
     VuFind.loadHtml(container, url, '', function containerLoad(responseText) {
       if (!responseText || responseText.length === 0) {
-        if (container.style) {
-          container.style.display = "none";
-        }
-        let parent = container.parentNode;
-        while (parent && parent.classList.contains('js-hide-if-empty')) {
-          if (parent.style) {
+        var element = typeof container === 'string' ? document.querySelector(container) : container;
+        if (element) {
+          element.style.display = "none";
+          let parent = element.parentNode;
+          while (parent && parent.classList.contains('js-hide-if-empty')) {
             parent.style.display = "none";
+            parent = parent.parentNode;
           }
-          parent = parent.parentNode;
         }
       } else {
         VuFind.initResultScripts(container);

diff --git a/themes/bootstrap5/js/combined-search.js b/themes/bootstrap5/js/combined-search.js
@@ -4,15 +4,14 @@ VuFind.combinedSearch = (function CombinedSearch() {
   function init(container, url) {
     VuFind.loadHtml(container, url, '', function containerLoad(responseText) {
       if (!responseText || responseText.length === 0) {
-        if (container.style) {
-          container.style.display = "none";
-        }
-        let parent = container.parentNode;
-        while (parent && parent.classList.contains('js-hide-if-empty')) {
-          if (parent.style) {
+        var element = typeof container === 'string' ? document.querySelector(container) : container;
+        if (element) {
+          element.style.display = "none";
+          let parent = element.parentNode;
+          while (parent && parent.classList.contains('js-hide-if-empty')) {
             parent.style.display = "none";
+            parent = parent.parentNode;
           }
-          parent = parent.parentNode;
         }
       } else {
         VuFind.initResultScripts(container);