From 5d762eaf47cef4785d9f051c387d6971b59bdd68 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Fri, 4 Jan 2013 14:37:47 -0500
Subject: Added better explaination for the lightbox.

---
 views/default/js/lightbox.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'views/default/js')

diff --git a/views/default/js/lightbox.php b/views/default/js/lightbox.php
index d2bceaf90..a1f018eea 100644
--- a/views/default/js/lightbox.php
+++ b/views/default/js/lightbox.php
@@ -3,7 +3,8 @@
  * Elgg lightbox
  *
  * Usage
- * Apply the class elgg-lightbox to links.
+ * Call elgg_load_js('lightbox') and elgg_load_css('lightbox') then
+ * apply the class elgg-lightbox to links.
  *
  * Advanced Usage
  * Elgg is distributed with the Fancybox jQuery library. Please go to
-- 
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 'views/default/js')

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