summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-11-02 20:58:46 +0300
committerAndrew Dolgov <[email protected]>2014-11-02 20:58:46 +0300
commitd9c93ebfdb860878609c6a59ef4df99f8f93643f (patch)
treede6119e9b51001dc37880483d616e6877c8b6df4 /js
parente44280a0bd650239ef1d931d1d41cb0379df4eb9 (diff)
tweak notifications; use css animations for notifications
Diffstat (limited to 'js')
-rw-r--r--js/functions.js28
1 files changed, 11 insertions, 17 deletions
diff --git a/js/functions.js b/js/functions.js
index 9915e6808..720a5654a 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -182,11 +182,6 @@ function param_unescape(arg) {
return unescape(arg);
}
-
-function hide_notify() {
- Element.hide('notify');
-}
-
function notify_real(msg, no_hide, n_type) {
var n = $("notify");
@@ -198,13 +193,11 @@ function notify_real(msg, no_hide, n_type) {
}
if (msg == "") {
- if (Element.visible(n)) {
- notify_hide_timerid = window.setTimeout("hide_notify()", 0);
+ if (n.hasClassName("visible")) {
+ notify_hide_timerid = window.setTimeout(function() {
+ n.removeClassName("visible") }, 0);
}
return;
- } else {
- Element.show(n);
- new Effect.Highlight(n);
}
/* types:
@@ -218,18 +211,18 @@ function notify_real(msg, no_hide, n_type) {
msg = "<span class=\"msg\"> " + __(msg) + "</span>";
- if (n_type == 1) {
- n.className = "notify";
- } else if (n_type == 2) {
- n.className = "notify progress";
+ if (n_type == 2) {
+ n.className = "notify notify_progress visible";
msg = "<span><img src='images/indicator_white.gif'></span>" + msg;
no_hide = true;
} else if (n_type == 3) {
- n.className = "notify error";
+ n.className = "notify notify_error visible";
msg = "<span><img src='images/alert.png'></span>" + msg;
} else if (n_type == 4) {
- n.className = "notify info";
+ n.className = "notify notify_info visible";
msg = "<span><img src='images/information.png'></span>" + msg;
+ } else {
+ n.className = "notify visible";
}
msg += " <span><img src=\"images/cross.png\" class=\"close\" title=\"" +
@@ -240,7 +233,8 @@ function notify_real(msg, no_hide, n_type) {
n.innerHTML = msg;
if (!no_hide) {
- notify_hide_timerid = window.setTimeout("hide_notify()", 5*1000);
+ notify_hide_timerid = window.setTimeout(function() {
+ n.removeClassName("visible") }, 5*1000);
}
}