Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 0 insertions, 39 deletions

diff --git a/js/lib/autocomplete.js b/js/lib/autocomplete.js
deleted file mode 100644
index 917326d4f..000000000
--- a/js/lib/autocomplete.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 
- */
-elgg.provide('elgg.autocomplete');
-
-elgg.autocomplete.init = function() {
-	$('.elgg-input-autocomplete').autocomplete({
-		source: elgg.autocomplete.url, //gets set by input/autocomplete
-		minLength: 1,
-		select: function(event, ui) {
-			var item = ui.item;
-			$(this).val(item.name);
-	
-			var hidden = $(this).next();
-			hidden.val(item.guid);
-		}
-	})
-	
-	//@todo This seems convoluted
-	.data("autocomplete")._renderItem = 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.register_hook_handler('init', 'system', elgg.autocomplete.init);
\ No newline at end of file