From b691e4e2c002ef83c0c2e2bbd74885d4828b5c67 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Mon, 17 Dec 2012 15:56:06 -0500
Subject: Fixes #4963, refs #4847. Error messages don't automatically fade.

---
 js/lib/elgglib.js | 8 ++++++--
 js/lib/ui.js      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'js/lib')

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);
 
-- 
cgit v1.2.3


From 36a020b7e5f8ec7e68d9ee15cf1f845e5a47e103 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 26 Jan 2013 14:08:54 -0500
Subject: Fixes #4956 language unit tests pass again

---
 js/lib/languages.js       | 3 +++
 views/default/js/elgg.php | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'js/lib')

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/views/default/js/elgg.php b/views/default/js/elgg.php
index b82d98ce4..6fe03484d 100644
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -56,7 +56,8 @@ if (0) { ?><script><?php }
 elgg.version = '<?php echo get_version(); ?>';
 elgg.release = '<?php echo get_version(true); ?>';
 elgg.config.wwwroot = '<?php echo elgg_get_site_url(); ?>';
-elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?>
+<?php //@todo make this configurable ?>
+elgg.security.interval = 5 * 60 * 1000;
 elgg.config.domReady = false;
 elgg.config.language = '<?php echo isset($CONFIG->language) ? $CONFIG->language : 'en'; ?>';
 elgg.config.languageReady = false;
-- 
cgit v1.2.3