Refs #3800 including jeditable on more admin pages

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index c16da92955d7cd5ed1f9f7855408bd659082cc0d..93ee430080cfd66d741cd897546669e73b2ef745 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -239,6 +239,9 @@ function admin_init() {
        elgg_register_action('profile/fields/reorder', '', 'admin');
 
        elgg_register_simplecache_view('js/admin');
+       $url = elgg_get_simplecache_url('js', 'admin');
+       elgg_register_js('elgg.admin', $url);
+       elgg_register_js('jquery.jeditable', 'vendors/jquery/jquery.jeditable.mini.js');
 
        // administer
        // dashboard
@@ -434,11 +437,7 @@ function admin_settings_page_handler($page) {
        elgg_set_context('admin');
 
        elgg_unregister_css('elgg');
-       $url = elgg_get_simplecache_url('js', 'admin');
-       elgg_register_js('elgg.admin', $url);
        elgg_load_js('elgg.admin');
-
-       elgg_register_js('jquery.jeditable', 'vendors/jquery/jquery.jeditable.mini.js');
        elgg_load_js('jquery.jeditable');
 
        // default to dashboard
@@ -548,9 +547,8 @@ function admin_markdown_page_handler($pages) {
        elgg_set_context('admin');
 
        elgg_unregister_css('elgg');
-       $url = elgg_get_simplecache_url('js', 'admin');
-       elgg_register_js('elgg.admin', $url);
        elgg_load_js('elgg.admin');
+       elgg_load_js('jquery.jeditable');
        elgg_load_library('elgg:markdown');
 
        $plugin_id = elgg_extract(0, $pages);

diff --git a/views/default/js/admin.php b/views/default/js/admin.php
index 2f2f5928771e847b2dae2752d9fc9dda1bbb2432..253a738879e00bf5f2a7c8be0c37662e0d4530e4 100644 (file)
--- a/views/default/js/admin.php
+++ b/views/default/js/admin.php
@@ -32,6 +32,7 @@ elgg.admin.init = function () {
        });
 
        // in-line editing for custom profile fields.
+       // @note this requires jquery.jeditable plugin
        $(".elgg-state-editable").editable(elgg.admin.editProfileField, {
                type:   'text',
                onblur: 'submit',