Fixes 4209: jquery.form.js library loading

diff --git a/engine/lib/views.php b/engine/lib/views.php
index d3c9ff55181100269398c33546e699d19f81f27c..b938dd60e20cc120cf2c917f6650c6a59c965885 100644 (file)
--- 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 2e3df76638e5e4b8c8749083a6f83533c4de06c9..79ec0655a9490ca2644111b41788e7cf343f868d 100644 (file)
--- 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 015c0c0e41eddc41d3f27130e5ed31c5661787d1..7c070fa75c4d521a2ee47f4f29def98d1d922c1f 100644 (file)
--- 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;