Merge pull request #3549 from ProjectSidewalk/3542-cleanup-buggy-Labe…

…lMap-code Added check for 404 bug, and removed labelmap breaking code
ProjectSidewalk · May 18, 2024 · 7029cb3 · 7029cb3
2 parents 4781a73 + bd04cc2
commit 7029cb3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/app/views/labelMap.scala.html b/app/views/labelMap.scala.html
@@ -238,17 +238,5 @@
             });
         });
     }
-
-    // Fully destroy label modal when it's closed to prevent weird behavior when opening another.
-    $(window).on('click', function(e) {
-        var modal = $("#labelModal");
-        if (modal != null && !(modal.hasClass('in'))) {
-            modal.modal('hide');
-            setTimeout(function() {
-                modal.remove();
-                $('.modal-backdrop').remove();
-            }, 200)
-        }
-    });
     </script>
 }
diff --git a/public/javascripts/Admin/src/Admin.GSVLabelView.js b/public/javascripts/Admin/src/Admin.GSVLabelView.js
@@ -481,7 +481,10 @@ function AdminGSVLabelView(admin, source) {
     }
 
     function showLabel(labelId) {
-        _resetModal();
+        // Reset modal when gsv panorama is not found.gi
+        if (self.panorama.panorama.getStatus() === "ZERO_RESULTS") {
+            _resetModal();
+        }
 
         self.modal.modal({
             'show': true