aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-26 15:45:50 -0800
committerfriendica <info@friendica.com>2014-12-26 15:45:50 -0800
commit82d3c2a7e0e4ad3b7e46af090956efe66857278d (patch)
tree6fb6a254cc2e01fe711b76eb550472911cb62f79 /view/js
parent7ba92feabf97804b5a43ffe85fffc289247c27db (diff)
parente08226f432848b0582f505ee5e1bcc912b33a878 (diff)
downloadvolse-hubzilla-82d3c2a7e0e4ad3b7e46af090956efe66857278d.tar.gz
volse-hubzilla-82d3c2a7e0e4ad3b7e46af090956efe66857278d.tar.bz2
volse-hubzilla-82d3c2a7e0e4ad3b7e46af090956efe66857278d.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/js')
-rw-r--r--view/js/autocomplete.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index ba71bb2f5..7c3145769 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -7,7 +7,6 @@ function mysearch(term, callback, backend_url) {
var postdata = {
start:0,
count:100,
- //search:term.substring(1),
search:term,
type:'c',
}
@@ -40,7 +39,7 @@ function replace(item) {
// Autocomplete contacts
contacts = {
- match: /(^|\s)(@!?)(\w{2,})$/,
+ match: /(^|\s)(@\!*)([^ \n]+)$/,
index: 3,
search: function(term, callback) { mysearch(term, callback, backend_url); },
replace: replace,