diff options
| author | friendica <info@friendica.com> | 2014-12-21 14:45:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-21 14:45:46 -0800 |
| commit | b840c279957667168b400207caff14dc78043994 (patch) | |
| tree | ece0b11af5e7055226c566e4aa35ef4a7a781de0 /view/js/autocomplete.js | |
| parent | 2b3cc585a24cbdf97e8e2382752297bc4f725e12 (diff) | |
| parent | c732b72a0dde2c8b4d49e63114c9415f44a8a8d7 (diff) | |
| download | volse-hubzilla-b840c279957667168b400207caff14dc78043994.tar.gz volse-hubzilla-b840c279957667168b400207caff14dc78043994.tar.bz2 volse-hubzilla-b840c279957667168b400207caff14dc78043994.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/js/autocomplete.js')
| -rw-r--r-- | view/js/autocomplete.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index fa293fdfd..e62959a6c 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -50,9 +50,9 @@ function replace(item) { smilies = { match: /(^|\s)(:[a-z]{2,})$/, index: 2, - search: function(term, callback) { $.getJSON('https://caterva.eu/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry['text'].indexOf(term) === 0 ? entry : null })) }) }, + search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry['text'].indexOf(term) === 0 ? entry : null })) }) }, template: function(item) { return item['icon'] + item['text'] }, - replace: function(item) { return item['text'] + ' '; }, + replace: function(item) { return "$1"+item['text'] + ' '; }, } this.textcomplete([contacts,smilies],{}); }; |