diff options
author | Cash Costello <cash.costello@gmail.com> | 2011-10-17 19:37:30 -0700 |
---|---|---|
committer | Cash Costello <cash.costello@gmail.com> | 2011-10-17 19:37:30 -0700 |
commit | 63ebe7b121105beb7e4c8b9b82e3c649f6a9a489 (patch) | |
tree | 79f51f8b6e94203297cbbc899f3daa400475de34 /views/default/input/autocomplete.php | |
parent | 9a3ec606cfe2cbbe08949a56198bf9d4bb2e1e64 (diff) | |
parent | 34c968355231216624c2beae59ea9ad17f7ef2c0 (diff) | |
download | elgg-63ebe7b121105beb7e4c8b9b82e3c649f6a9a489.tar.gz elgg-63ebe7b121105beb7e4c8b9b82e3c649f6a9a489.tar.bz2 |
Merge pull request #74 from cash/autocomplete
Fixes #2102, #2712, #3450 Finishes autocomplete and userpicker for 1.8.1
Diffstat (limited to 'views/default/input/autocomplete.php')
-rw-r--r-- | views/default/input/autocomplete.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/views/default/input/autocomplete.php b/views/default/input/autocomplete.php index 421541e24..e58eb1ae8 100644 --- a/views/default/input/autocomplete.php +++ b/views/default/input/autocomplete.php @@ -8,7 +8,7 @@ * @todo This currently only works for ONE AUTOCOMPLETE TEXT FIELD on a page. * * @uses $vars['value'] Current value for the text input - * @uses $vars['match_on'] Array | str What to match on. all|array(groups|users|friends|subtype) + * @uses $vars['match_on'] Array | str What to match on. all|array(groups|users|friends) * @uses $vars['match_owner'] Bool. Match only entities that are owned by logged in user. * @uses $vars['class'] Additional CSS class */ @@ -26,15 +26,19 @@ $defaults = array( $vars = array_merge($defaults, $vars); -$ac_url_params = http_build_query(array( - 'match_on' => $vars['match_on'], - 'match_owner' => $vars['match_owner'], -)); - -unset($vars['match_on']); -unset($vars['match_owner']); +$params = array(); +if (isset($vars['match_on'])) { + $params['match_on'] = $vars['match_on']; + unset($vars['match_on']); +} +if (isset($vars['match_owner'])) { + $params['match_owner'] = $vars['match_owner']; + unset($vars['match_owner']); +} +$ac_url_params = http_build_query($params); elgg_load_js('elgg.autocomplete'); +elgg_load_js('jquery.ui.autocomplete.html'); ?> |