aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 22:25:02 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 22:25:02 +0000
commitbfb0a3e9b289e4036bfeb3e694586387fc4f904e (patch)
tree6beec05b6424702e036d67622db37ac6f8852a54 /views
parent1bd696b3d8eb8175cc2b6583716fe3e89110aab0 (diff)
downloadelgg-bfb0a3e9b289e4036bfeb3e694586387fc4f904e.tar.gz
elgg-bfb0a3e9b289e4036bfeb3e694586387fc4f904e.tar.bz2
Fixes #3091 adds load functions for js and css
git-svn-id: http://code.elgg.org/elgg/trunk@8675 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/input/autocomplete.php2
-rw-r--r--views/default/input/friendspicker.php4
-rw-r--r--views/default/input/userpicker.php2
-rw-r--r--views/default/page/elements/head.php4
4 files changed, 6 insertions, 6 deletions
diff --git a/views/default/input/autocomplete.php b/views/default/input/autocomplete.php
index 212333141..b16d08fc3 100644
--- a/views/default/input/autocomplete.php
+++ b/views/default/input/autocomplete.php
@@ -29,7 +29,7 @@ $ac_url_params = http_build_query(array(
unset($vars['match_on']);
unset($vars['match_owner']);
-elgg_register_js('elgg.autocomplete', 'js/lib/autocomplete.js');
+elgg_load_js('elgg.autocomplete');
?>
diff --git a/views/default/input/friendspicker.php b/views/default/input/friendspicker.php
index b5f347e0c..1a60e0d88 100644
--- a/views/default/input/friendspicker.php
+++ b/views/default/input/friendspicker.php
@@ -11,8 +11,8 @@
* @uses $vars['entities'] The array of ElggUser objects
*/
-elgg_register_js('elgg.friendspicker', 'js/lib/friends_picker.js');
-elgg_register_js('jquery.easing', 'vendors/jquery/jquery.easing.1.3.packed.js');
+elgg_load_js('elgg.friendspicker');
+elgg_load_js('jquery.easing');
$chararray = elgg_echo('friendspicker:chararray');
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 8280305b0..656effc98 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -18,7 +18,7 @@
*
*/
-elgg_register_js('elgg.userpicker', 'js/lib/userpicker.js');
+elgg_load_js('elgg.userpicker');
function user_picker_add_user($user_id) {
$user = get_entity($user_id);
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 209eb35f4..5f9bf4798 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -30,8 +30,8 @@ END;
$feedref = "";
}
-$js = elgg_get_js('head');
-$css = elgg_get_css();
+$js = elgg_get_loaded_js('head');
+$css = elgg_get_loaded_css();
$version = get_version();
$release = get_version(true);