From: Brion Vibber Date: Tue, 7 Dec 2010 00:20:54 +0000 (-0800) Subject: Start tweaking Autocomplete js X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=daae13df1c2d202cba0769803a9ef03892495ccb;p=quix0rs-gnu-social.git Start tweaking Autocomplete js --- diff --git a/plugins/Autocomplete/Autocomplete.js b/plugins/Autocomplete/Autocomplete.js index 3eff685a8d..f39c1a7a72 100644 --- a/plugins/Autocomplete/Autocomplete.js +++ b/plugins/Autocomplete/Autocomplete.js @@ -1,27 +1,22 @@ $(document).ready(function(){ + function fullName(row) { + if (typeof row.fullname == "string" && row.fullname != '') { + return row.nickname + ' (' + row.fullname + ')'; + } else { + return row.nickname; + } + } $('#notice_data-text').autocomplete($('address .url')[0].href+'/plugins/Autocomplete/autocomplete.json', { multiple: true, multipleSeparator: " ", minChars: 1, formatItem: function(row, i, max){ row = eval("(" + row + ")"); - switch(row.type) - { - case 'user': - return row.nickname + ' (' + row.fullname + ')'; - case 'group': - return row.nickname + ' (' + row.fullname + ')'; - } + return fullName(row); }, formatMatch: function(row, i, max){ row = eval("(" + row + ")"); - switch(row.type) - { - case 'user': - return row.nickname; - case 'group': - return row.nickname; - } + return row.nickname; }, formatResult: function(row){ row = eval("(" + row + ")");