diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-06-20 15:48:40 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-06-20 15:48:40 -0700 |
| commit | 5023e99301cd7576ea25056b77a43576a6e36b9a (patch) | |
| tree | 535e4f8a690089a68e4772a73d9a909e756bdf07 | |
| parent | 690f226100a2f690bd77d05a82668c9cfee7b863 (diff) | |
| parent | d343f71960285f4acd94fa9547719eea9cfdc760 (diff) | |
| download | elgg-5023e99301cd7576ea25056b77a43576a6e36b9a.tar.gz elgg-5023e99301cd7576ea25056b77a43576a6e36b9a.tar.bz2 | |
Merge pull request #277 from jeabakker/#4604
Fixes #4604: Pages: potential useless loading of JS (jQuery treeview)
| -rw-r--r-- | mod/pages/start.php | 4 | ||||
| -rw-r--r-- | mod/pages/views/default/pages/sidebar/navigation.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mod/pages/start.php b/mod/pages/start.php index 834e98870..c385131bd 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -106,10 +106,6 @@ function pages_page_handler($page) { elgg_load_library('elgg:pages'); - // add the jquery treeview files for navigation - elgg_load_js('jquery-treeview'); - elgg_load_css('jquery-treeview'); - if (!isset($page[0])) { $page[0] = 'all'; } diff --git a/mod/pages/views/default/pages/sidebar/navigation.php b/mod/pages/views/default/pages/sidebar/navigation.php index fe017b1a7..65eb500c8 100644 --- a/mod/pages/views/default/pages/sidebar/navigation.php +++ b/mod/pages/views/default/pages/sidebar/navigation.php @@ -5,6 +5,11 @@ * @uses $vars['page'] Page object if manually setting selected item */ +// add the jquery treeview files for navigation +elgg_load_js('jquery-treeview'); +elgg_load_css('jquery-treeview'); + + $selected_page = elgg_extract('page', $vars, false); if ($selected_page) { $url = $selected_page->getURL(); @@ -51,4 +56,3 @@ if ($selected_page) { }); </script> - |