Revert "Refs #2102. Autocomplete is working now."

This reverts commit e4f0cbb222ee39a1d1d21f0d69c39bcc6df9d452.

diff --git a/js/lib/autocomplete.js b/js/lib/autocomplete.js
index 748070eaa7063da3732298103fe54619aaf64b56..917326d4f7ed757dca656df4508f9d81f5b0b5f6 100644 (file)
--- a/js/lib/autocomplete.js
+++ b/js/lib/autocomplete.js
@@ -5,35 +5,18 @@ elgg.provide('elgg.autocomplete');
 
 elgg.autocomplete.init = function() {
        $('.elgg-input-autocomplete').autocomplete({
-               source: function( request, response ) {
-                       $.ajax({
-                               url: elgg.autocomplete.url, //gets set by input/autocomplete
-                               dataType: "json",
-                               data: {
-                                       q: request.term
-                               },
-                               success: function( data ) {
-                                       response( $.map( data, function( item ) {
-                                               item.value = item.name;
-                                               return item;
-                                       }));
-                               }
-                       })
-               },
+               source: elgg.autocomplete.url, //gets set by input/autocomplete
                minLength: 1,
                select: function(event, ui) {
                        var item = ui.item;
-                       item.value = item.name;
-                               
-                       if($(this).next().attr('type') == "hidden"){
-                               var hidden = $(this).next();
-                       } else {
-                               var hidden = $(this).after('<input type="hidden" name="'+this.name+'[]" />').next();
-                       }
+                       $(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':
@@ -48,9 +31,9 @@ elgg.autocomplete.init = function() {
                
                return $("<li/>")
                        .data("item.autocomplete", item)
-                       .append('<a>'+r+'</a>')
+                       .append(r)
                        .appendTo(ul);
        };
 };
 
-elgg.register_hook_handler('init', 'system', elgg.autocomplete.init);
+elgg.register_hook_handler('init', 'system', elgg.autocomplete.init);
\ No newline at end of file

diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 0b88c6bdaa7d5623bc6c7b74a3f004cfd03df657..e5ffb8af266bc8d54632977595e17e258ba919e9 100644 (file)
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -352,7 +352,7 @@ input[type="radio"] {
        margin: 0;
 }
 
-.ui-autocomplete li a {
+.ui-autocomplete li {
        margin: 0px;
        padding: 2px 5px;
        cursor: default;
@@ -380,10 +380,9 @@ input[type="radio"] {
        background-color: #eee;
 }
 
-.ui-autocomplete .ui-state-hover {
+.ui-autocomplete li:hover {
        background-color: #4690D6;
        color: white;
-       text-decoration: none;
 }
 
 .ui-autocomplete strong {