aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-20 14:29:31 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-20 14:29:31 +0200
commitad08cfbc5f670f5cc874bdc107c9662f68d566b3 (patch)
treea0bfcd030b9c56b974946cb5d4462ce3c5bc0b8c
parent60abc2738ba2ea6eed2d991f37d3a546c5826909 (diff)
parent1e64968ff7cf24ba9f59a528237163d412fa501c (diff)
downloadnextcloud-server-ad08cfbc5f670f5cc874bdc107c9662f68d566b3.tar.gz
nextcloud-server-ad08cfbc5f670f5cc874bdc107c9662f68d566b3.zip
Merge pull request #19748 from owncloud/update-preventclose
Prevent leaving the DB update page while in progress
-rw-r--r--core/js/update.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/js/update.js b/core/js/update.js
index bc8df0e20c0..090f8fa5d23 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -27,6 +27,11 @@
this.$el = $el;
this._started = true;
+
+ $(window).on('beforeunload.inprogress', function () {
+ return t('core', 'The upgrade is in progress, leaving this page might interrupt the process in some environments.');
+ });
+
this.addMessage(t(
'core',
'Updating {productName} to version {version}, this may take a while.', {
@@ -46,12 +51,14 @@
});
updateEventSource.listen('error', function(message) {
message = message || t('core', 'An error occurred.');
+ $(window).off('beforeunload.inprogress');
$('<span>').addClass('error').append(message).append('<br />').appendTo($el);
message = t('core', 'Please reload the page.');
$('<span>').addClass('error').append('<a href=".">'+message+'</a><br />').appendTo($el);
updateEventSource.close();
});
updateEventSource.listen('failure', function(message) {
+ $(window).off('beforeunload.inprogress');
$('<span>').addClass('error').append(message).append('<br />').appendTo($el);
$('<span>')
.addClass('bold')
@@ -61,6 +68,8 @@
.appendTo($el);
});
updateEventSource.listen('done', function() {
+ $(window).off('beforeunload.inprogress');
+
if (hasWarnings) {
$('<span>').addClass('bold')
.append('<br />')