aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-12-23 08:48:11 +1100
committerRedMatrix <info@friendica.com>2014-12-23 08:48:11 +1100
commit3f6e9a37db70437088668f98e957e55c9feaadf3 (patch)
tree7a3621f7922f00adf2ec2a8efc8519b874cfa185 /view/js
parent5fd26eceb417a06be99f66980f2800f59523c5d9 (diff)
parentb6bbb8e4ad04ba834ae613265473d838ff99ab52 (diff)
downloadvolse-hubzilla-3f6e9a37db70437088668f98e957e55c9feaadf3.tar.gz
volse-hubzilla-3f6e9a37db70437088668f98e957e55c9feaadf3.tar.bz2
volse-hubzilla-3f6e9a37db70437088668f98e957e55c9feaadf3.zip
Merge pull request #758 from pafcu/autocomplete
Show autocomplete taggable with special color
Diffstat (limited to 'view/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 );