Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added check for 404 bug, and removed labelmap breaking code #3549

Merged
merged 1 commit into from
May 18, 2024
Merged

Added check for 404 bug, and removed labelmap breaking code #3549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions app/views/labelMap.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
}
5 changes: 4 additions & 1 deletion public/javascripts/Admin/src/Admin.GSVLabelView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down