aboutsummaryrefslogtreecommitdiff
path: root/mod/developers
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-12-22 08:12:07 -0500
committerCash Costello <cash.costello@gmail.com>2011-12-22 08:12:07 -0500
commite49df853b2cc3a6a9bc2dd527a64951050142eb9 (patch)
tree6f485b560f89331c65fad3993e055a1834b07177 /mod/developers
parent5e5b3705a5ca7b66dfe386490c5570af88b49009 (diff)
parentfea599f1653d7206e34ac33c0c0a668cb587bc20 (diff)
downloadelgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.gz
elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.bz2
Merge branch '1.8' after 1.8.2 release
Conflicts: version.php
Diffstat (limited to 'mod/developers')
-rw-r--r--mod/developers/start.php14
1 files changed, 8 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) {