X Tutup
Skip to content

Display clickable links in upgrade process #39184

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

Merged
AlexAndBear merged 1 commit into from
Sep 16, 2021
Merged

Display clickable links in upgrade process #39184

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
7 changes: 7 additions & 0 deletions changelog/unreleased/39184
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: Display clickable links during web UI upgrade process

Before this PR, error messages can contain links that have not been clickable.
With this PR, links are clickable and open them in a new tab.

https://github.com/owncloud/core/pull/39184
https://github.com/owncloud/core/issues/39178
28 changes: 19 additions & 9 deletions core/js/update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,33 +110,43 @@
},

setMessage: function(message) {
$('#update-progress-message').html(message);
var parsedMessage = this.parseMessage(message);
$('#update-progress-message').html(parsedMessage);
$('#update-progress-detailed')
.append($('<span>'))
.append(message)
.append(parsedMessage)
.append($('<br>'));
},

setPermanentMessage: function(message) {
$('#update-progress-message').html(message);
var parsedMessage = this.parseMessage(message);
$('#update-progress-message').html(parsedMessage);
$('#update-progress-message-warnings')
.show()
.append($('<ul>').append(message));
.append($('<ul>').append(parsedMessage));
$('#update-progress-detailed')
.append($('<span>'))
.append(message)
.append(parsedMessage)
.append($('<br>'));
},

setErrorMessage: function (message) {
var parsedMessage = this.parseMessage(message);
$('#update-progress-message-error')
.show()
.html(message);
.html(parsedMessage);
$('#update-progress-detailed')
.append($('<span>'))
.append(message)
.append(parsedMessage)
.append($('<br>'));
}
},

parseMessage: function (message) {
// generate a tags from urls
var urlRegex = /(https?:\/\/[^\s]+)/g;
return message.replace(urlRegex, '<a href="$1" target="_blank">$1</a>');
},

};

})();
Expand Down
X Tutup