aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-05 03:06:06 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-05 03:06:06 +0000
commit6bf4fabc33541ef7b924c2904f3892b73c6b6a20 (patch)
tree5d1a6a98c6dcc11aa3cfd01a363347d78d53b11d
parent3fe0a4b4aa2dd07873d46ac8e463709d39592056 (diff)
downloadelgg-6bf4fabc33541ef7b924c2904f3892b73c6b6a20.tar.gz
elgg-6bf4fabc33541ef7b924c2904f3892b73c6b6a20.tar.bz2
Fixes #2676 system messages fade out again
git-svn-id: http://code.elgg.org/elgg/trunk@7835 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--js/lib/ui.js3
-rw-r--r--views/default/js/elgg.php16
2 files changed, 11 insertions, 8 deletions
diff --git a/js/lib/ui.js b/js/lib/ui.js
index 56f2d5eb0..fff13c800 100644
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -6,6 +6,9 @@ elgg.ui.init = function () {
$(this).stop().fadeOut('fast');
});
+ $('.elgg-system-messages li').animate({opacity: 0.9}, 5000);
+ $('.elgg-system-messages li').fadeOut('slow');
+
$('.elgg-toggle').live('click', elgg.ui.toggle);
$('.elgg-menu-parent').live('click', elgg.ui.toggleMenu);
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
index f7f1e942c..3a6e0c814 100644
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -73,14 +73,14 @@ $(document).ready(function () {
// display & hide elgg system messages
function elgg_system_message() {
- $("#elgg-system-message").animate({opacity: 0.9}, 1000);
- $("#elgg-system-message").animate({opacity: 0.9}, 5000);
- $("#elgg-system-message").fadeOut('slow');
-
- $("#elgg-system-message").click(function () {
- $("#elgg-system-message").stop();
- $("#elgg-system-message").fadeOut('slow');
- return false;
+ $('.elgg-system-messages li').animate({opacity: 0.9}, 1000);
+ $('.elgg-system-messages li').animate({opacity: 0.9}, 5000);
+ $('.elgg-system-messages li').fadeOut('slow');
+
+ $('.elgg-system-messages li').click(function() {
+ $('.elgg-system-messages li').stop();
+ $('.elgg-system-messages li').fadeOut('slow');
+ return false;
});
}