summaryrefslogtreecommitdiffstats
path: root/core/js/update.js
diff options
context:
space:
mode:
Diffstat (limited to 'core/js/update.js')
-rw-r--r--core/js/update.js64
1 files changed, 46 insertions, 18 deletions
diff --git a/core/js/update.js b/core/js/update.js
index 77ac1bb20ff..d15609ad471 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -28,38 +28,47 @@
this._started = true;
+ var self = this;
+
$(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(
+ $('#update-progress-title').html(t(
'core',
- 'Updating {productName} to version {version}, this may take a while.', {
- productName: options.productName || 'ownCloud',
+ 'Updating to {version}', {
version: options.version
- }),
- 'bold'
- ).append('<br />'); // FIXME: these should be ul/li with CSS paddings!
+ })
+ );
var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
updateEventSource.listen('success', function(message) {
- $('<span>').append(message).append('<br />').appendTo($el);
+ self.setMessage(message);
});
updateEventSource.listen('notice', function(message) {
- $('<span>').addClass('error').append(message).append('<br />').appendTo($el);
+ self.setPermanentMessage(message);
hasWarnings = true;
});
updateEventSource.listen('error', function(message) {
+ $('#update-progress-message').hide();
+ $('#update-progress-icon')
+ .addClass('icon-error-white')
+ .removeClass('icon-loading-dark');
message = message || t('core', 'An error occurred.');
$(window).off('beforeunload.inprogress');
- $('<span>').addClass('error').append(message).append('<br />').appendTo($el);
+ self.setErrorMessage(message);
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);
+ $('#update-progress-message').hide();
+ $('#update-progress-icon')
+ .addClass('icon-error-white')
+ .removeClass('icon-loading-dark');
+
+ self.setErrorMessage(message);
var span = $('<span>')
.addClass('bold');
if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') {
@@ -74,8 +83,14 @@
updateEventSource.listen('done', function() {
$(window).off('beforeunload.inprogress');
+ $('#update-progress-message').hide();
+
+ $('#update-progress-icon')
+ .addClass('icon-checkmark-white')
+ .removeClass('icon-loading-dark');
+
if (hasWarnings) {
- $('<span>').addClass('bold')
+ $('<span>')
.append('<br />')
.append(t('core', 'The update was successful. There were warnings.'))
.appendTo($el);
@@ -83,7 +98,7 @@
$('<span>').append('<br />').append(message).append('<br />').appendTo($el);
} else {
// FIXME: use product name
- $('<span>').addClass('bold')
+ $('<span>')
.append('<br />')
.append(t('core', 'The update was successful. Redirecting you to ownCloud now.'))
.appendTo($el);
@@ -94,10 +109,21 @@
});
},
- addMessage: function(message, className) {
- var $span = $('<span>');
- $span.addClass(className).append(message).append('<br />').appendTo(this.$el);
- return $span;
+ setMessage: function(message) {
+ $('#update-progress-message').html(message);
+ },
+
+ setPermanentMessage: function(message) {
+ $('#update-progress-message').html(message);
+ $('#update-progress-message-warnings')
+ .show()
+ .append($('<ul>').append(message))
+ },
+
+ setErrorMessage: function (message) {
+ $('#update-progress-message-error')
+ .show()
+ .html(message);
}
};
@@ -106,12 +132,14 @@
$(document).ready(function() {
$('.updateButton').on('click', function() {
var $updateEl = $('.update');
- var $progressEl = $('.updateProgress');
+ var $progressEl = $('.update-progress');
$progressEl.removeClass('hidden');
$('.updateOverview').addClass('hidden');
+ $('#update-progress-message-error').hide();
+ $('#update-progress-message-warnings').hide();
OC.Update.start($progressEl, {
productName: $updateEl.attr('data-productname'),
- version: $updateEl.attr('data-version'),
+ version: $updateEl.attr('data-version')
});
return false;
});