diff --git a/apps/common/embed/lib/controller/modals.js b/apps/common/embed/lib/controller/modals.js index a315719abe..7491321e23 100644 --- a/apps/common/embed/lib/controller/modals.js +++ b/apps/common/embed/lib/controller/modals.js @@ -152,6 +152,11 @@ config.callback(btn); } }); + $dlgWarning.on('click', '[data-dismiss="modal"]', function() { + if (config.closecallback) { + config.closecallback(); + } + }); $dlgWarning.on('hidden.bs.modal', function() { $dlgWarning.remove(); diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 4f872885be..3a75b2feb8 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -786,6 +786,9 @@ DE.ApplicationController = new(function(){ if (btn === me.txtYes) { window.open(url); } + }, + closecallback: function() { + WarningShown = false; } }); } @@ -799,6 +802,9 @@ DE.ApplicationController = new(function(){ buttons: [me.txtClose], callback: function(btn) { window.location.reload(); + }, + closecallback: function() { + window.location.reload(); } }); return; @@ -908,6 +914,11 @@ DE.ApplicationController = new(function(){ if (level == Asc.c_oAscError.Level.Critical) { window.location.reload(); } + }, + closecallback: function() { + if (level == Asc.c_oAscError.Level.Critical) { + window.location.reload(); + } } }); diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index fd705acc16..a3a89cc131 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -632,6 +632,9 @@ PE.ApplicationController = new(function(){ if (btn === me.txtYes) { window.open(url); } + }, + closecallback: function() { + WarningShown = false; } }); } @@ -645,6 +648,9 @@ PE.ApplicationController = new(function(){ buttons: [me.txtClose], callback: function(btn) { window.location.reload(); + }, + closecallback: function() { + window.location.reload(); } }); return; @@ -748,6 +754,11 @@ PE.ApplicationController = new(function(){ if (level == Asc.c_oAscError.Level.Critical) { window.location.reload(); } + }, + closecallback: function() { + if (level == Asc.c_oAscError.Level.Critical) { + window.location.reload(); + } } }); diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 06f57b6316..c0e49225b5 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -677,6 +677,9 @@ SSE.ApplicationController = new(function(){ if (btn === me.txtYes) { window.open(url); } + }, + closecallback: function() { + WarningShown = false; } }); } @@ -690,6 +693,9 @@ SSE.ApplicationController = new(function(){ buttons: [me.txtClose], callback: function(btn) { window.location.reload(); + }, + closecallback: function() { + window.location.reload(); } }); return; @@ -793,6 +799,11 @@ SSE.ApplicationController = new(function(){ if (level == Asc.c_oAscError.Level.Critical) { window.location.reload(); } + }, + closecallback: function() { + if (level == Asc.c_oAscError.Level.Critical) { + window.location.reload(); + } } }); diff --git a/apps/visioeditor/embed/js/ApplicationController.js b/apps/visioeditor/embed/js/ApplicationController.js index 99b5c159ee..3bbd9a3177 100644 --- a/apps/visioeditor/embed/js/ApplicationController.js +++ b/apps/visioeditor/embed/js/ApplicationController.js @@ -675,6 +675,9 @@ VE.ApplicationController = new(function(){ if (btn === me.txtYes) { window.open(url); } + }, + closecallback: function() { + WarningShown = false; } }); } @@ -688,6 +691,9 @@ VE.ApplicationController = new(function(){ buttons: [me.txtClose], callback: function(btn) { window.location.reload(); + }, + closecallback: function() { + window.location.reload(); } }); return; @@ -791,6 +797,11 @@ VE.ApplicationController = new(function(){ if (level == Asc.c_oAscError.Level.Critical) { window.location.reload(); } + }, + closecallback: function() { + if (level == Asc.c_oAscError.Level.Critical) { + window.location.reload(); + } } });