From e57ad78561dd4e80eb3621475aaade030c0fbdd0 Mon Sep 17 00:00:00 2001
From: Jeff Tilson <jrtilson@gmail.com>
Date: Fri, 25 Nov 2011 18:11:12 -0500
Subject: Need to call elgg_register_simplecache_view('css/lightbox') to
 register the lightbox CSS with simplecache

---
 engine/lib/views.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engine/lib/views.php')

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 0f806b8be..d3c9ff551 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1602,6 +1602,7 @@ function elgg_views_boot() {
 	elgg_load_js('elgg');
 
 	elgg_register_simplecache_view('js/lightbox');
+	elgg_register_simplecache_view('css/lightbox');
 	$lightbox_js_url = elgg_get_simplecache_url('js', 'lightbox');
 	elgg_register_js('lightbox', $lightbox_js_url);
 	$lightbox_css_url = elgg_get_simplecache_url('css', 'lightbox');
-- 
cgit v1.2.3


From d784d088ddfd6cc0d74f79539872921c358b75cb Mon Sep 17 00:00:00 2001
From: Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
Date: Thu, 15 Dec 2011 13:20:56 +0100
Subject: Fixes 4209: jquery.form.js library loading

---
 engine/lib/views.php     |  1 -
 mod/developers/start.php | 14 ++++++++------
 mod/embed/start.php      |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'engine/lib/views.php')

diff --git a/engine/lib/views.php b/engine/lib/views.php
index d3c9ff551..b938dd60e 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1598,7 +1598,6 @@ function elgg_views_boot() {
 
 	elgg_load_js('jquery');
 	elgg_load_js('jquery-ui');
-	elgg_load_js('jquery.form');
 	elgg_load_js('elgg');
 
 	elgg_register_simplecache_view('js/lightbox');
diff --git a/mod/developers/start.php b/mod/developers/start.php
index 2e3df7663..79ec0655a 100644
--- a/mod/developers/start.php
+++ b/mod/developers/start.php
@@ -23,6 +23,8 @@ function developers_init() {
 	elgg_register_js('jquery.jstree', 'mod/developers/vendors/jsTree/jquery.jstree.js', 'footer');
 	elgg_register_css('jquery.jstree', 'mod/developers/vendors/jsTree/themes/default/style.css');
 
+	elgg_load_js('jquery.form');
+
 	elgg_register_js('elgg.dev', 'js/developers/developers.js', 'footer');
 	elgg_load_js('elgg.dev');
 }
@@ -166,13 +168,13 @@ function developers_theme_preview_controller($page) {
 
 	$pages = array(
 		'buttons',
-		'components', 
-		'forms', 
-		'grid', 
+		'components',
+		'forms',
+		'grid',
 		'icons',
-		'modules', 
-		'navigation', 
-		'typography', 
+		'modules',
+		'navigation',
+		'typography',
 	);
 	
 	foreach ($pages as $page_name) {
diff --git a/mod/embed/start.php b/mod/embed/start.php
index 015c0c0e4..7c070fa75 100644
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -49,6 +49,7 @@ function embed_longtext_menu($hook, $type, $items, $vars) {
 
 	elgg_load_js('lightbox');
 	elgg_load_css('lightbox');
+	elgg_load_js('jquery.form');
 	elgg_load_js('elgg.embed');
 	
 	return $items;
-- 
cgit v1.2.3