aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/autocomplete.js
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-09 09:09:13 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-09 09:09:13 +0200
commit11045b92fb2a5af504a8d6cfba1f0fe67107e847 (patch)
tree4170ca20120a23e40bb98c6d6ac57a59b827dc28 /view/js/autocomplete.js
parent655290b022f0443a121790ef7f0c1d4ddeecb289 (diff)
parent2ad5010dc3f2f8d077a3228915d28a3e256f6e13 (diff)
downloadvolse-hubzilla-11045b92fb2a5af504a8d6cfba1f0fe67107e847.tar.gz
volse-hubzilla-11045b92fb2a5af504a8d6cfba1f0fe67107e847.tar.bz2
volse-hubzilla-11045b92fb2a5af504a8d6cfba1f0fe67107e847.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'view/js/autocomplete.js')
-rw-r--r--view/js/autocomplete.js2
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; },