scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-04 14:44:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #252 from Ducz0r/lm-sci-616-fix

Browse source 
Fix confirm() bug when saving report [SCI-616]
This commit is contained in:
Luka Murn 2016-10-25 18:14:21 +02:00 committed by GitHub
commit 2769784d9c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/reports/new.js.erb
View file

@ -317,7 +317,12 @@ function initializeSaveReport() {
.on("ajax:success", function(e, xhr, opts, data) { .on("ajax:success", function(e, xhr, opts, data) {
if (data.status == 200) { if (data.status == 200) {
// Redirect back to index // Redirect back to index
// Turn off all hooks related to alert window
ignoreUnsavedWorkAlert = true; ignoreUnsavedWorkAlert = true;
$(window).off('beforeunload');
$(document).off('page:before-change');
$(location).attr("href", xhr.url); $(location).attr("href", xhr.url);
} }
}) })
@ -439,9 +444,6 @@ function initializeUnsavedWorkDialog() {
var alertText = dh.attr('data-unsaved-work-text'); var alertText = dh.attr('data-unsaved-work-text');
ignoreUnsavedWorkAlert = false; ignoreUnsavedWorkAlert = false;
if ( ignoreUnsavedWorkAlert ) {
return;
}
$(window).on("beforeunload", function() { $(window).on("beforeunload", function() {
$(window).off('beforeunload'); $(window).off('beforeunload');
@ -451,7 +453,11 @@ function initializeUnsavedWorkDialog() {
$(document).on("page:before-change", function() { $(document).on("page:before-change", function() {
var exit; var exit;
if (ignoreUnsavedWorkAlert) {
exit = true;
} else {
exit = confirm(alertText); exit = confirm(alertText);
}
if ( exit ) { if ( exit ) {
// We leave the page so remove all listeners // We leave the page so remove all listeners
$(window).off('beforeunload'); $(window).off('beforeunload');