diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2012-12-17 15:56:06 -0500 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2012-12-17 15:56:06 -0500 |
| commit | b691e4e2c002ef83c0c2e2bbd74885d4828b5c67 (patch) | |
| tree | 08d77f0b189ef59546c73d9f15e992af058c56c0 /js | |
| parent | 93170dd8fb02fd2adb691c34742ca1e47d21c14d (diff) | |
| download | elgg-b691e4e2c002ef83c0c2e2bbd74885d4828b5c67.tar.gz elgg-b691e4e2c002ef83c0c2e2bbd74885d4828b5c67.tar.bz2 | |
Fixes #4963, refs #4847. Error messages don't automatically fade.
Diffstat (limited to 'js')
| -rw-r--r-- | js/lib/elgglib.js | 8 | ||||
| -rw-r--r-- | js/lib/ui.js | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js index dc7c07165..af2c94000 100644 --- a/js/lib/elgglib.js +++ b/js/lib/elgglib.js @@ -347,8 +347,12 @@ elgg.system_messages = function(msgs, delay, type) { msgs.forEach(appendMessage); - $(messages_html.join('')).appendTo(systemMessages) - .animate({opacity: '1.0'}, delay).fadeOut('slow'); + if (type != 'error') { + $(messages_html.join('')).appendTo(systemMessages) + .animate({opacity: '1.0'}, delay).fadeOut('slow'); + } else { + $(messages_html.join('')).appendTo(systemMessages); + } }; /** diff --git a/js/lib/ui.js b/js/lib/ui.js index 2a4d269d6..413078b4f 100644 --- a/js/lib/ui.js +++ b/js/lib/ui.js @@ -10,7 +10,7 @@ elgg.ui.init = function () { }); $('.elgg-system-messages li').animate({opacity: 0.9}, 6000); - $('.elgg-system-messages li').fadeOut('slow'); + $('.elgg-system-messages li.elgg-state-success').fadeOut('slow'); $('[rel=toggle]').live('click', elgg.ui.toggles); |