Merge remote-tracking branch 'origin/release-9.1' into dev

subhh · Mar 25, 2024 · cbdafe7 · cbdafe7
2 parents ee9d024 + 066276f
commit cbdafe7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/themes/bootstrap3/js/check_item_statuses.js b/themes/bootstrap3/js/check_item_statuses.js
@@ -219,7 +219,14 @@ VuFind.register('itemStatuses', function ItemStatuses() {
   }
 
   function checkAllItemStatuses(container = document) {
-    container.querySelectorAll(".ajaxItem").forEach(checkItemStatus);
+    const records = container.querySelectorAll(".ajaxItem");
+
+    if (records.length === 0) {
+      VuFind.emit("item-status-done");
+      return;
+    }
+
+    records.forEach(checkItemStatus);
   }
 
   function init($container = document) {

diff --git a/themes/bootstrap3/js/check_save_statuses.js b/themes/bootstrap3/js/check_save_statuses.js
@@ -127,10 +127,18 @@ VuFind.register("saveStatuses", function ItemStatuses() {
 
   function checkAllSaveStatuses(container = document) {
     if (!userIsLoggedIn) {
+      VuFind.emit("save-status-done");
+      return;
+    }
+
+    const records = container.querySelectorAll(".result,.record");
+
+    if (records.length === 0) {
+      VuFind.emit("save-status-done");
       return;
     }
 
-    container.querySelectorAll(".result,.record").forEach(checkSaveStatus);
+    records.forEach(checkSaveStatus);
   }
 
   function refresh() {

diff --git a/themes/bootstrap3/js/trigger_print.js b/themes/bootstrap3/js/trigger_print.js
@@ -1,12 +1,19 @@
 /* global VuFind */
 
 function waitForItemStatuses(fn) {
-  var itemDone = false;
-  var saveDone = false;
+  var itemDone = typeof VuFind.itemStatuses === "undefined";
+  var saveDone = typeof VuFind.saveStatuses === "undefined";
+  var fnCalled = false;
+
+  if (itemDone && saveDone) {
+    fn();
+    return;
+  }
 
   function checkBoth() {
-    if (itemDone && saveDone) {
+    if (!fnCalled && itemDone && saveDone) {
       fn();
+      fnCalled = true;
     }
   }
 
@@ -21,7 +28,7 @@ function waitForItemStatuses(fn) {
   });
 }
 
-$(function triggerPrint() {
+(function triggerPrint() {
   if (!VuFind.isPrinting()) {
     return;
   }
@@ -60,4 +67,4 @@ $(function triggerPrint() {
     // Make an ajax call to ensure that ajaxStop is triggered
     $.getJSON(VuFind.path + '/AJAX/JSON', {method: 'keepAlive'});
   });
-});
+})();