Skip to content

Commit e163efb

Browse files
committed
links in webui warning message now render as <a>
1 parent 78d37a4 commit e163efb

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

git-webui/release/share/git-webui/webui/js/git-webui.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ $.get("api/settings", function(settingsURL){
7272
webui.showSuccess = function(message) {
7373
var messageBox = $("#message-box");
7474
messageBox.empty();
75+
7576
$( '<div class="alert alert-success alert-dismissible" role="alert">' +
7677
'<button type="button" class="btn btn-default close" data-dismiss="alert">' +
7778
webui.largeXIcon+
@@ -88,6 +89,16 @@ webui.showError = function(message) {
8889
webui.showWarning = function(message) {
8990
var messageBox = $("#message-box");
9091
messageBox.empty();
92+
93+
var messageAsArr = message.split(" ");
94+
messageAsArr = messageAsArr.map(function(messagePart){
95+
if (messagePart.startsWith("https://")) {
96+
return '<a href="' + messagePart + '" target="_blank">' + messagePart + '</a>';
97+
} else {
98+
return messagePart;
99+
}
100+
});
101+
message = messageAsArr.join(" ")
91102
$( '<div class="alert alert-warning alert-dismissible" role="alert">' +
92103
'<button type="button" class="btn btn-default close" data-dismiss="alert">' +
93104
webui.largeXIcon+

git-webui/src/share/git-webui/webui/js/git-webui.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ $.get("api/settings", function(settingsURL){
7272
webui.showSuccess = function(message) {
7373
var messageBox = $("#message-box");
7474
messageBox.empty();
75+
7576
$( '<div class="alert alert-success alert-dismissible" role="alert">' +
7677
'<button type="button" class="btn btn-default close" data-dismiss="alert">' +
7778
webui.largeXIcon+
@@ -88,6 +89,19 @@ webui.showError = function(message) {
8889
webui.showWarning = function(message) {
8990
var messageBox = $("#message-box");
9091
messageBox.empty();
92+
93+
// convert links in message into actual html links
94+
var messageAsArr = message.split(" ");
95+
messageAsArr = messageAsArr.map(function(messagePart){
96+
if (messagePart.startsWith("https://")) {
97+
return '<a href="' + messagePart + '" target="_blank">' + messagePart + '</a>';
98+
} else {
99+
return messagePart;
100+
}
101+
});
102+
message = messageAsArr.join(" ")
103+
104+
91105
$( '<div class="alert alert-warning alert-dismissible" role="alert">' +
92106
'<button type="button" class="btn btn-default close" data-dismiss="alert">' +
93107
webui.largeXIcon+

0 commit comments

Comments
 (0)