aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/autocomplete.js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-22 14:32:06 -0800
committerfriendica <info@friendica.com>2014-12-22 14:32:06 -0800
commit046299139a79a74e5745535829b51bb2258de5dc (patch)
tree3bc3ffd450ba522b7dbd3ebde47f1bbfca5d25da /view/js/autocomplete.js
parentb8d16bc9db0f2ccdb5d32c75034adca894696aa2 (diff)
parent8cf57f95a5244329dbf45004210733b2afcbb6d7 (diff)
downloadvolse-hubzilla-046299139a79a74e5745535829b51bb2258de5dc.tar.gz
volse-hubzilla-046299139a79a74e5745535829b51bb2258de5dc.tar.bz2
volse-hubzilla-046299139a79a74e5745535829b51bb2258de5dc.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/js/autocomplete.js')
-rw-r--r--view/js/autocomplete.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index e62959a6c..ba71bb2f5 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -24,7 +24,7 @@ function mysearch(term, callback, backend_url) {
}
function format(item) {
- return "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(item.photo, item.name, ((item.label) ? item.nick + ' ' + item.label : item.nick) )
+ return "<div class='{0}'><img src='{1}'>{2} ({3})</div>".format(item.taggable, item.photo, item.name, ((item.label) ? item.nick + ' ' + item.label : item.nick) )
}
function replace(item) {
@@ -54,6 +54,6 @@ function replace(item) {
template: function(item) { return item['icon'] + item['text'] },
replace: function(item) { return "$1"+item['text'] + ' '; },
}
- this.textcomplete([contacts,smilies],{});
+ this.textcomplete([contacts,smilies],{className:'acpopup'});
};
})( jQuery );