diff options
| author | Sem <sembrestels@riseup.net> | 2013-02-13 01:25:07 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-02-13 01:25:07 +0100 |
| commit | 5aff5b3913fbb6226d8fb3162453c58888fba38d (patch) | |
| tree | 2bf8fe649d8c9d09a3be03154c4c669bccfbc54c /js | |
| parent | 3ed289b03fa3d851fd7fffbc0441ebc9b5e98310 (diff) | |
| parent | 8d3a7ab1755829c6e070a038d6b33e326de8fc8f (diff) | |
| download | elgg-5aff5b3913fbb6226d8fb3162453c58888fba38d.tar.gz elgg-5aff5b3913fbb6226d8fb3162453c58888fba38d.tar.bz2 | |
Merge tag '1.8.13' of git://github.com/Elgg/Elgg
Elgg 1.8.13 release
Diffstat (limited to 'js')
| -rw-r--r-- | js/lib/elgglib.js | 8 | ||||
| -rw-r--r-- | js/lib/languages.js | 3 | ||||
| -rw-r--r-- | js/lib/ui.js | 2 |
3 files changed, 10 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/languages.js b/js/lib/languages.js index a8ba72c31..99a1ba0ee 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -4,6 +4,9 @@ */ elgg.provide('elgg.config.translations'); +// default language - required by unit tests +elgg.config.language = 'en'; + /** * Analagous to the php version. Merges translations for a * given language into the current translations map. 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); |