aboutsummaryrefslogtreecommitdiff
path: root/views/default/friends
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-04 00:52:46 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-04 00:52:46 +0000
commitd37535628dfc7751831fca4740162e590a6b5709 (patch)
tree7bda402578543830a88aa158e864af6b730b2683 /views/default/friends
parente6dedda9508150b25ea8d2bccfa8af17ebfbffec (diff)
downloadelgg-d37535628dfc7751831fca4740162e590a6b5709.tar.gz
elgg-d37535628dfc7751831fca4740162e590a6b5709.tar.bz2
Fixes #2210 - using new functions for registering the core js and css files
git-svn-id: http://code.elgg.org/elgg/trunk@7233 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/friends')
-rw-r--r--views/default/friends/picker.php20
1 files changed, 14 insertions, 6 deletions
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index 9e1d556f6..78c10e394 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -9,9 +9,11 @@
* @uses $vars['entities'] The array of ElggUser objects
*/
-// Let the system know that the friends picker is in use
-global $pickerinuse;
-$pickerinuse = true;
+$base = elgg_get_site_url();
+$viewtype = elgg_get_viewtype();
+elgg_register_js("{$base}vendors/jquery/jquery.easing.1.3.packed.js", 'jquery.easing');
+elgg_register_js("{$base}_css/js.php?lastcache={$vars['config']->lastcache}&js=friendsPickerv1&viewtype=$viewtype", 'friendsPicker');
+
$chararray = elgg_echo('friendspicker:chararray');
// Initialise internalname
@@ -22,8 +24,12 @@ if (!isset($vars['internalname'])) {
}
// Are we highlighting default or all?
-if (empty($vars['highlight'])) $vars['highlight'] = 'default';
-if ($vars['highlight'] != 'all') $vars['highlight'] = 'default';
+if (empty($vars['highlight'])) {
+ $vars['highlight'] = 'default';
+}
+if ($vars['highlight'] != 'all') {
+ $vars['highlight'] = 'default';
+}
// Initialise values
if (!isset($vars['value'])) {
@@ -45,7 +51,9 @@ if (isset($vars['callback'])) {
// We need to count the number of friends pickers on the page.
if (!isset($vars['friendspicker'])) {
global $friendspicker;
- if (!isset($friendspicker)) $friendspicker = 0;
+ if (!isset($friendspicker)) {
+ $friendspicker = 0;
+ }
$friendspicker++;
} else {
$friendspicker = $vars['friendspicker'];