aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2011-12-18 17:02:48 -0500
committercash <cash.costello@gmail.com>2011-12-18 17:02:48 -0500
commitea3bf3b04410f56a52e8315bd636aeaf772a40a4 (patch)
tree2bc1e1e5e2a6160feb043b56e24183cd3a6e41ea /mod
parenta41f00224a0b5bc241b569138f4562bae4b811dd (diff)
parentd784d088ddfd6cc0d74f79539872921c358b75cb (diff)
downloadelgg-ea3bf3b04410f56a52e8315bd636aeaf772a40a4.tar.gz
elgg-ea3bf3b04410f56a52e8315bd636aeaf772a40a4.tar.bz2
Merge pull request #113 from hypeJunction/4209_jqueryformjs
Diffstat (limited to 'mod')
-rw-r--r--mod/developers/start.php14
-rw-r--r--mod/embed/start.php1
2 files changed, 9 insertions, 6 deletions
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 940219476..a3ccab66b 100644
--- a/mod/embed/start.php
+++ b/mod/embed/start.php
@@ -54,6 +54,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;