From 28da2f9dcb560687d4904e7629ad38049ed3188a Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Thu, 6 Oct 2011 22:27:33 -0400
Subject: using html extension to jquery.ui autocomplete

---
 views/default/input/autocomplete.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'views/default/input')

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');
 
 ?>
 
-- 
cgit v1.2.3


From 7e23a3bd6382190084f136ed5aeb6b910ae00eee Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Thu, 13 Oct 2011 20:45:40 -0400
Subject: got the friends option working for user picker

---
 js/lib/userpicker.js               | 53 ++++++++++----------------------------
 views/default/input/userpicker.php |  3 ++-
 2 files changed, 16 insertions(+), 40 deletions(-)

(limited to 'views/default/input')

diff --git a/js/lib/userpicker.js b/js/lib/userpicker.js
index 826bf21a0..780fa47c6 100644
--- a/js/lib/userpicker.js
+++ b/js/lib/userpicker.js
@@ -1,14 +1,14 @@
 elgg.provide('elgg.userpicker');
 
 elgg.userpicker.init = function() {
+	
 	// binding autocomplete.
 	// doing this as an each so we can pass this to functions.
 	$('.elgg-input-user-picker').each(function() {
-		
-		var _this = this;
-		
+
 		$(this).autocomplete({
 			source: function(request, response) {
+
 				var params = elgg.userpicker.getSearchParams(this);
 				
 				elgg.get('livesearch', {
@@ -20,53 +20,28 @@ elgg.userpicker.init = function() {
 				});
 			},
 			minLength: 2,
+			html: "html",
 			select: elgg.userpicker.addUser
 		})
-		
-		//@todo This seems convoluted
-		.data("autocomplete")._renderItem = elgg.userpicker.formatItem;
 	});
 };
 
-elgg.userpicker.formatItem = function(ul, item) {
-	switch (item.type) {
-		case 'user':
-		case 'group':
-			r = item.icon + item.name + ' - ' + item.desc;
-			break;
-
-		default:
-			r = item.name + ' - ' + item.desc;
-			break;
-	}
-	
-	return $("<li/>")
-		.data("item.autocomplete", item)
-		.append(r)
-		.appendTo(ul);
-};
-
+/**
+ * elgg.userpicker.userList is defined in the input/userpicker view
+ */
 elgg.userpicker.addUser = function(event, ui) {
 	var info = ui.item;
-	
+
 	// do not allow users to be added multiple times
 	if (!(info.guid in elgg.userpicker.userList)) {
 		elgg.userpicker.userList[info.guid] = true;
-	
-		var picker = $(this).closest('.elgg-user-picker');
-		var users = picker.find('.elgg-user-picker-entries');
-		var internalName = users.find('[type=hidden]').attr('name');
-		
-		// not sure why formatted isn't.
-		var formatted = elgg.userpicker.formatItem(data);
-
-		// add guid as hidden input and to list.
-		var li = formatted + ' <div class="delete-button"><a onclick="elgg.userpicker.removeUser(this, ' + info.guid + ')"><strong>X</strong></a></div>'
-		+ '<input type="hidden" name="' + internalName + '" value="' + info.guid + '" />';
+		var users = $(this).siblings('.elgg-user-picker-entries');
+		var li = '<input type="hidden" name="members[]" value="' + info.guid + '" />';
 		$('<li>').html(li).appendTo(users);
-
-		$(this).val('');
 	}
+
+	$(this).val('');
+	event.preventDefault();
 };
 
 elgg.userpicker.removeUser = function(link, guid) {
@@ -74,7 +49,7 @@ elgg.userpicker.removeUser = function(link, guid) {
 };
 
 elgg.userpicker.getSearchParams = function(e) {
-	if ($(e).closest('.elgg-user-picker').find('[name=match_on]').attr('checked')) {
+	if (e.element.siblings('[name=match_on]').attr('checked')) {
 		return {'match_on[]': 'friends', 'term' : e.term};
 	} else {
 		return {'match_on[]': 'users', 'term' : e.term};
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index b852d24fc..94129d1e0 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -62,7 +62,8 @@ foreach ($vars['value'] as $user_id) {
 ?>
 <div class="elgg-user-picker">
 	<input type="text" class="elgg-input-user-picker" size="30"/>
-	<label><input type="checkbox" name="match_on" value="true" /><?php echo elgg_echo('userpicker:only_friends'); ?></label>
+	<input type="checkbox" name="match_on" value="true" />
+	<label><?php echo elgg_echo('userpicker:only_friends'); ?></label>
 	<ul class="elgg-user-picker-entries"><?php echo $user_list; ?></ul>
 </div>
 <script type="text/javascript">
-- 
cgit v1.2.3


From c6a14d6c6a04eeee2c126ea20ec0e9ee23489ef3 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Thu, 13 Oct 2011 21:31:27 -0400
Subject: displaying users that have been selected and added remove capability

---
 engine/lib/input.php                 | 39 ++++++++++++++++++++++++++++++++---
 js/lib/userpicker.js                 | 40 +++++++++++++++++++++++++++---------
 views/default/css/elements/forms.php | 15 ++++++--------
 views/default/input/userpicker.php   | 19 ++++++++---------
 4 files changed, 81 insertions(+), 32 deletions(-)

(limited to 'views/default/input')

diff --git a/engine/lib/input.php b/engine/lib/input.php
index ceda2be3b..f2cefc3e5 100644
--- a/engine/lib/input.php
+++ b/engine/lib/input.php
@@ -288,17 +288,26 @@ function input_livesearch_page_handler($page) {
 
 				if ($entities = get_data($query)) {
 					foreach ($entities as $entity) {
+						$entity = get_entity($entity->guid);
+						if (!$entity) {
+							continue;
+						}
+
 						if (in_array('groups', $match_on)) {
 							$value = $entity->guid;
 						} else {
 							$value = $entity->username;
 						}
 
-						$output = elgg_view_list_item(get_entity($entity->guid), array(
+						$output = elgg_view_list_item($entity, array(
 							'hover' => false,
 							'class' => 'elgg-autocomplete-item',
 						));
 
+						$icon = elgg_view_entity_icon($entity, 'tiny', array(
+							'hover' => false,
+						));
+
 						$result = array(
 							'type' => 'user',
 							'name' => $entity->name,
@@ -306,6 +315,8 @@ function input_livesearch_page_handler($page) {
 							'guid' => $entity->guid,
 							'label' => $output,
 							'value' => $value,
+							'icon' => $icon,
+							'url' => $entity->getURL(),
 						);
 						$results[$entity->name . rand(1, 100)] = $result;
 					}
@@ -326,11 +337,20 @@ function input_livesearch_page_handler($page) {
 				";
 				if ($entities = get_data($query)) {
 					foreach ($entities as $entity) {
-						$output = elgg_view_list_item(get_entity($entity->guid), array(
+						$entity = get_entity($entity->guid);
+						if (!$entity) {
+							continue;
+						}
+
+						$output = elgg_view_list_item($entity, array(
 							'hover' => false,
 							'class' => 'elgg-autocomplete-item',
 						));
 
+						$icon = elgg_view_entity_icon($entity, 'tiny', array(
+							'hover' => false,
+						));
+
 						$result = array(
 							'type' => 'group',
 							'name' => $entity->name,
@@ -338,6 +358,8 @@ function input_livesearch_page_handler($page) {
 							'guid' => $entity->guid,
 							'label' => $output,
 							'value' => $entity->guid,
+							'icon' => $icon,
+							'url' => $entity->getURL(),
 						);
 
 						$results[$entity->name . rand(1, 100)] = $result;
@@ -362,11 +384,20 @@ function input_livesearch_page_handler($page) {
 
 				if ($entities = get_data($query)) {
 					foreach ($entities as $entity) {
-						$output = elgg_view_list_item(get_entity($entity->guid), array(
+						$entity = get_entity($entity->guid);
+						if (!$entity) {
+							continue;
+						}
+
+						$output = elgg_view_list_item($entity, array(
 							'hover' => false,
 							'class' => 'elgg-autocomplete-item',
 						));
 
+						$icon = elgg_view_entity_icon($entity, 'tiny', array(
+							'hover' => false,
+						));
+
 						$result = array(
 							'type' => 'user',
 							'name' => $entity->name,
@@ -374,6 +405,8 @@ function input_livesearch_page_handler($page) {
 							'guid' => $entity->guid,
 							'label' => $output,
 							'value' => $entity->username,
+							'icon' => $icon,
+							'url' => $entity->getURL(),
 						);
 						$results[$entity->name . rand(1, 100)] = $result;
 					}
diff --git a/js/lib/userpicker.js b/js/lib/userpicker.js
index 780fa47c6..ece5a6951 100644
--- a/js/lib/userpicker.js
+++ b/js/lib/userpicker.js
@@ -24,7 +24,9 @@ elgg.userpicker.init = function() {
 			select: elgg.userpicker.addUser
 		})
 	});
-};
+
+	$('.elgg-userpicker-remove').live('click', elgg.userpicker.removeUser);
+}
 
 /**
  * elgg.userpicker.userList is defined in the input/userpicker view
@@ -35,24 +37,42 @@ elgg.userpicker.addUser = function(event, ui) {
 	// do not allow users to be added multiple times
 	if (!(info.guid in elgg.userpicker.userList)) {
 		elgg.userpicker.userList[info.guid] = true;
-		var users = $(this).siblings('.elgg-user-picker-entries');
+		var users = $(this).siblings('.elgg-user-picker-list');
 		var li = '<input type="hidden" name="members[]" value="' + info.guid + '" />';
+		li += elgg.userpicker.renderUser(info);
 		$('<li>').html(li).appendTo(users);
 	}
 
 	$(this).val('');
 	event.preventDefault();
-};
+}
+
+elgg.userpicker.removeUser = function(event) {
+	$(this).closest('.elgg-user-picker-list > li').remove();
+	event.preventDefault();
+}
 
-elgg.userpicker.removeUser = function(link, guid) {
-	$(link).closest('.elgg-user-picker-entries > li').remove();
-};
+/**
+ * The html in this method has to remain sync'ed with input/userpicker
+ */
+elgg.userpicker.renderUser = function(info) {
+
+	var deleteLink = "<a href='#' class='elgg-userpicker-remove'>X</a>";
+
+	var html = "<div class='elgg-image-block'>";
+	html += "<div class='elgg-image'>" + info.icon + "</div>";
+	html += "<div class='elgg-image-alt'>" + deleteLink + "</div>";
+	html += "<div class='elgg-body'>" + info.name + "</div>";
+	html += "</div";
+	
+	return html;
+}
 
-elgg.userpicker.getSearchParams = function(e) {
-	if (e.element.siblings('[name=match_on]').attr('checked')) {
-		return {'match_on[]': 'friends', 'term' : e.term};
+elgg.userpicker.getSearchParams = function(obj) {
+	if (obj.element.siblings('[name=match_on]').attr('checked')) {
+		return {'match_on[]': 'friends', 'term' : obj.term};
 	} else {
-		return {'match_on[]': 'users', 'term' : e.term};
+		return {'match_on[]': 'users', 'term' : obj.term};
 	}
 }
 
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index fa90f2bfd..255d95622 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -272,15 +272,12 @@ input[type="radio"] {
 /* ***************************************
 	USER PICKER
 *************************************** */
-.user-picker .user-picker-entry {
-	clear:both;
-	height:25px;
-	padding:5px;
-	margin-top:5px;
-	border-bottom:1px solid #cccccc;
-}
-.user-picker-entry .elgg-button-delete {
-	margin-right:10px;
+.elgg-user-picker-list li:first-child {
+	border-top: 1px dotted #ccc;
+	margin-top: 5px;
+}
+.elgg-user-picker-list > li {
+	border-bottom: 1px dotted #ccc;
 }
 
 /* ***************************************
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 94129d1e0..87cc6e24a 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -24,18 +24,17 @@ elgg_load_js('elgg.userpicker');
 function user_picker_add_user($user_id) {
 	$user = get_entity($user_id);
 	if (!$user || !($user instanceof ElggUser)) {
-		return FALSE;
+		return false;
 	}
 	
-	$icon = $user->getIconURL('tiny');
-	
-	$code = '<li class="elgg-image-block">';
-	$code .= "<div class='elgg-image'><img class=\"livesearch_icon\" src=\"$icon\" /></div>";
-	$code .= "<div class='elgg-image-alt'><a onclick='elgg.userpicker.removeUser(this, $user_id)'><strong>X</strong></a></div>";
-	$code .= "<div class='elgg-body'>";
-	$code .= "$user->name - $user->username";
-	$code .= "<input type=\"hidden\" name=\"members[]\" value=\"$user_id\">";
+	$icon = elgg_view_entity_icon($user, 'tiny', array('hover' => false));
+
+	$code = '<li><div class="elgg-image-block">';
+	$code .= "<div class='elgg-image'>$icon</div>";
+	$code .= "<div class='elgg-image-alt'><a href='#' class='elgg-userpicker-remove'>X</a></div>";
+	$code .= "<div class='elgg-body'>" . $user->name . "</div>";
 	$code .= "</div>";
+	$code .= "<input type=\"hidden\" name=\"members[]\" value=\"$user_id\">";
 	$code .= '</li>';
 	
 	return $code;
@@ -64,7 +63,7 @@ foreach ($vars['value'] as $user_id) {
 	<input type="text" class="elgg-input-user-picker" size="30"/>
 	<input type="checkbox" name="match_on" value="true" />
 	<label><?php echo elgg_echo('userpicker:only_friends'); ?></label>
-	<ul class="elgg-user-picker-entries"><?php echo $user_list; ?></ul>
+	<ul class="elgg-user-picker-list"><?php echo $user_list; ?></ul>
 </div>
 <script type="text/javascript">
 	elgg.userpicker.userList = <?php echo $json_values ?>;
-- 
cgit v1.2.3


From 34c968355231216624c2beae59ea9ad17f7ef2c0 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Thu, 13 Oct 2011 22:05:49 -0400
Subject: added documentation for the userpicker

---
 js/lib/userpicker.js               | 39 +++++++++++++++++++++++++++++++++++---
 views/default/input/userpicker.php | 10 ++++++----
 2 files changed, 42 insertions(+), 7 deletions(-)

(limited to 'views/default/input')

diff --git a/js/lib/userpicker.js b/js/lib/userpicker.js
index f2c2aa53f..ae2add53f 100644
--- a/js/lib/userpicker.js
+++ b/js/lib/userpicker.js
@@ -1,5 +1,13 @@
 elgg.provide('elgg.userpicker');
 
+/**
+ * Userpicker initialization
+ *
+ * The userpicker is an autocomplete library for selecting multiple users or
+ * friends. It works in concert with the view input/userpicker.
+ *
+ * @return void
+ */
 elgg.userpicker.init = function() {
 	
 	// binding autocomplete.
@@ -29,7 +37,13 @@ elgg.userpicker.init = function() {
 }
 
 /**
+ * Adds a user to the select user list
+ *
  * elgg.userpicker.userList is defined in the input/userpicker view
+ *
+ * @param {Object} event
+ * @param {Object} ui    The object returned by the autocomplete endpoint
+ * @return void
  */
 elgg.userpicker.addUser = function(event, ui) {
 	var info = ui.item;
@@ -39,7 +53,7 @@ elgg.userpicker.addUser = function(event, ui) {
 		elgg.userpicker.userList[info.guid] = true;
 		var users = $(this).siblings('.elgg-user-picker-list');
 		var li = '<input type="hidden" name="members[]" value="' + info.guid + '" />';
-		li += elgg.userpicker.renderUser(info);
+		li += elgg.userpicker.viewUser(info);
 		$('<li>').html(li).appendTo(users);
 	}
 
@@ -47,6 +61,12 @@ elgg.userpicker.addUser = function(event, ui) {
 	event.preventDefault();
 }
 
+/**
+ * Remove a user from the selected user list
+ *
+ * @param {Object} event
+ * @return void
+ */
 elgg.userpicker.removeUser = function(event) {
 	var item = $(this).closest('.elgg-user-picker-list > li');
 	
@@ -58,9 +78,14 @@ elgg.userpicker.removeUser = function(event) {
 }
 
 /**
- * The html in this method has to remain sync'ed with input/userpicker
+ * Render the list item for insertion into the selected user list
+ *
+ * The html in this method has to remain synced with the input/userpicker view
+ *
+ * @param {Object} info  The object returned by the autocomplete endpoint
+ * @return string
  */
-elgg.userpicker.renderUser = function(info) {
+elgg.userpicker.viewUser = function(info) {
 
 	var deleteLink = "<a href='#' class='elgg-userpicker-remove'>X</a>";
 
@@ -73,6 +98,14 @@ elgg.userpicker.renderUser = function(info) {
 	return html;
 }
 
+/**
+ * Get the parameters to use for autocomplete
+ *
+ * This grabs the value of the friends checkbox.
+ *
+ * @param {Object} obj  Object for the autocomplete callback
+ * @return Object
+ */
 elgg.userpicker.getSearchParams = function(obj) {
 	if (obj.element.siblings('[name=match_on]').attr('checked')) {
 		return {'match_on[]': 'friends', 'term' : obj.term};
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 87cc6e24a..5c4b297b1 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -9,14 +9,14 @@
  *
  * The name of the hidden fields is members[]
  *
- * Defaults to lazy load user lists in paginated alphabetical order. User needs
+ * @warning Only a single input/userpicker is supported per web page.
+ *
+ * Defaults to lazy load user lists in alphabetical order. User needs
  * to type two characters before seeing the user popup list.
  *
- * As users are checked they move down to a "users" box.
+ * As users are selected they move down to a "users" box.
  * When this happens, a hidden input is created with the
  * name of members[] and a value of the GUID.
- *
- * @warning: this is not stable
  */
 
 elgg_load_js('elgg.userpicker');
@@ -29,6 +29,7 @@ function user_picker_add_user($user_id) {
 	
 	$icon = elgg_view_entity_icon($user, 'tiny', array('hover' => false));
 
+	// this html must be synced with the userpicker.js library
 	$code = '<li><div class="elgg-image-block">';
 	$code .= "<div class='elgg-image'>$icon</div>";
 	$code .= "<div class='elgg-image-alt'><a href='#' class='elgg-userpicker-remove'>X</a></div>";
@@ -66,5 +67,6 @@ foreach ($vars['value'] as $user_id) {
 	<ul class="elgg-user-picker-list"><?php echo $user_list; ?></ul>
 </div>
 <script type="text/javascript">
+	// @todo grab the values in the init function rather than using inline JS
 	elgg.userpicker.userList = <?php echo $json_values ?>;
 </script>
\ No newline at end of file
-- 
cgit v1.2.3