diff options
| author | friendica <info@friendica.com> | 2015-01-20 14:05:22 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-20 14:05:22 -0800 |
| commit | 70fb47248b6579beabc81287750bc18aab2a7ddd (patch) | |
| tree | a403865fe2760b73952d5fadf061d4b1d0c0c28d /view/js/autocomplete.js | |
| parent | 7875b79f2f87bef0fc2ebddd3cee0ef952def5d4 (diff) | |
| parent | 43326a26b742430674b92347eb1e4ad8e1a16538 (diff) | |
| download | volse-hubzilla-70fb47248b6579beabc81287750bc18aab2a7ddd.tar.gz volse-hubzilla-70fb47248b6579beabc81287750bc18aab2a7ddd.tar.bz2 volse-hubzilla-70fb47248b6579beabc81287750bc18aab2a7ddd.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/js/autocomplete.js')
| -rw-r--r-- | view/js/autocomplete.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 50ba99279..1c524789d 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -56,7 +56,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick) if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return "<div class='{0}' title='{4}'><img src='{1}'>{2}{3}</div>".format(item.taggable, item.photo, item.name, desc, item.link) + return "<div class='{0}' title='{4}'><img src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link) } else return "<div>"+item.text+"</div>" @@ -111,7 +111,7 @@ function submit_form(e) { replace: function(item) { return "$1"+item['text'] + ' '; }, } this.attr('autocomplete','off'); - this.textcomplete([contacts,smilies],{className:'acpopup',zIndex:1050}); + this.textcomplete([contacts,smilies],{className:'acpopup',zIndex:1020}); }; })( jQuery ); @@ -130,7 +130,7 @@ function submit_form(e) { template: contact_format, } this.attr('autocomplete','off'); - var a = this.textcomplete([contacts],{className:'acpopup',maxCount:100,zIndex: 1050}); + var a = this.textcomplete([contacts],{className:'acpopup',maxCount:100,zIndex: 1020,appendTo:'nav'}); a.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); @@ -153,7 +153,7 @@ function submit_form(e) { } this.attr('autocomplete','off'); - var a = this.textcomplete([contacts],{className:'acpopup',zIndex:1050}); + var a = this.textcomplete([contacts],{className:'acpopup',zIndex:1020}); if(autosubmit) a.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); |