summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorRichard Beales <[email protected]>2013-03-18 13:55:54 +0000
committerRichard Beales <[email protected]>2013-03-18 13:55:54 +0000
commit1d707e9f03d1a654e0807aadce7ab790befd0b95 (patch)
tree923404b0b57939cb74a4989197184966705ff0fe /js
parent7c97d17aaf373339a8bcd917ad59ca6018148f0d (diff)
parente9f42579a38a03c9cdc454a712cb0ab68069226d (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'js')
-rw-r--r--js/functions.js5
-rw-r--r--js/prefs.js2
2 files changed, 6 insertions, 1 deletions
diff --git a/js/functions.js b/js/functions.js
index e00690c1c..be78294df 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -212,6 +212,11 @@ function notify_real(msg, no_hide, n_type) {
// msg = "<img src='images/live_com_loading.gif'> " + msg;
+ if (no_hide) {
+ msg += " (<a href='#' onclick=\"notify('')\">X</a>)";
+ }
+
+
nb.innerHTML = msg;
if (!no_hide) {
diff --git a/js/prefs.js b/js/prefs.js
index 676fb914a..e6257e1fb 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -547,7 +547,7 @@ function resetSelectedUserPass() {
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
- notify_info(transport.responseText);
+ notify_info(transport.responseText, true);
} });
}