add hack for spinner

Ajapaik · Nov 28, 2024 · 4659a3d · 4659a3d
1 parent 97772cd
commit 4659a3d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/ajapaik/ajapaik/static/js/ajp-frontpage.js b/ajapaik/ajapaik/static/js/ajp-frontpage.js
@@ -426,13 +426,17 @@
         window.updateFrontpagePhotosAsync = function() {
             const targetDiv = $('#ajp-frontpage-historic-photos');
             targetDiv.removeClass('hidden ajp-invisible');
-            $('#ajp-loading-overlay').show();
             $('#ajp-album-filter-box').addClass('d-none');
             $('#ajp-photo-filter-box').removeClass('d-none');
             syncStateToUrl();
             $.ajax({
                 url: window.frontpageAsyncURL + window.location.search,
                 method: 'GET',
+                beforeSend: function() {
+                    $('#ajp-loading-overlay').show();
+                    // HACK!
+                    window.loadingPhotos = true;
+                },
                 success: function(response) {
                     setWindowPaginationParameters(response);
                     let collection;
@@ -578,10 +582,13 @@
                         historicPhotoGalleryDiv.justifiedGallery();
                     }
                     $('#ajp-loading-overlay').hide();
+                    // HACK!
+                    window.loadingPhotos = false;
                     $(window).scrollTop(0);
                 },
                 error: function() {
                     $('#ajp-loading-overlay').hide();
+                    window.loadingPhotos = false;
                 },
             });
         };

diff --git a/ajapaik/ajapaik/templates/core/base_bootstrap.html b/ajapaik/ajapaik/templates/core/base_bootstrap.html
@@ -325,7 +325,9 @@
             $('#ajp-loading-overlay').show();
         });
         window.addEventListener('pageshow', function() {
-            $('#ajp-loading-overlay').hide();
+            if (!window.loadingPhotos) {
+                $('#ajp-loading-overlay').hide();
+            }
         });
 
         window.fbAsyncInit = function() {