aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-12 19:42:02 -0700
committerredmatrix <git@macgirvin.com>2016-04-12 19:42:02 -0700
commitf4a27afee9c1dc12afd2a15adef9f33654fa5ddd (patch)
tree0ffb4961afdebd60ecd3a1ede88c53743f0944a5
parentbe654f1769c3a71227b4b5eb8f5c2775476476c3 (diff)
parent571c72f85334cef380098782cce3da91f7a9b238 (diff)
downloadvolse-hubzilla-f4a27afee9c1dc12afd2a15adef9f33654fa5ddd.tar.gz
volse-hubzilla-f4a27afee9c1dc12afd2a15adef9f33654fa5ddd.tar.bz2
volse-hubzilla-f4a27afee9c1dc12afd2a15adef9f33654fa5ddd.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--view/js/autocomplete.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index a4a1fdf51..59e3600b3 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -314,9 +314,10 @@ function string2bb(element) {
a.on('textComplete:select', function(e, value, strategy) { value; });
- $(this).keypress(function(e){
+ a.keypress(function(e){
+ e.stopImmediatePropagation();
if (e.keyCode == 13) {
- x = listNewLineAutocomplete(this.id);
+ var x = listNewLineAutocomplete(this.id);
if(x)
e.preventDefault();
}