diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-07 20:43:49 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-07 20:43:49 -0400 |
| commit | cf180f614207e6cdae44d1e3649a469b8982ade0 (patch) | |
| tree | e2ffae5bbc7f12577dce0a0b9a7a638df142dd18 /view/js/autocomplete.js | |
| parent | 2af8105b460d300ba41928734c960f5f70613952 (diff) | |
| parent | 67665a8b9d8ff1dbcc26a46837447544d8968784 (diff) | |
| download | volse-hubzilla-cf180f614207e6cdae44d1e3649a469b8982ade0.tar.gz volse-hubzilla-cf180f614207e6cdae44d1e3649a469b8982ade0.tar.bz2 volse-hubzilla-cf180f614207e6cdae44d1e3649a469b8982ade0.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'view/js/autocomplete.js')
| -rw-r--r-- | view/js/autocomplete.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 33d825b55..59a9ed355 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -183,7 +183,7 @@ function string2bb(element) { }; smilies = { - match: /(^|\s)(:[a-z]{2,})$/, + match: /(^|\s)(:[a-z_:]{2,})$/, index: 2, 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; }, |