harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
redmatrix 2016-04-12 19:42:02 -07:00
commit f4a27afee9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
view/js/autocomplete.js
View File

@ -314,9 +314,10 @@ function string2bb(element) {
a.on('textComplete:select', function(e, value, strategy) { value; }); a.on('textComplete:select', function(e, value, strategy) { value; });
$(this).keypress(function(e){ a.keypress(function(e){
e.stopImmediatePropagation();
if (e.keyCode == 13) { if (e.keyCode == 13) {
x = listNewLineAutocomplete(this.id); var x = listNewLineAutocomplete(this.id);
if(x) if(x)
e.preventDefault(); e.preventDefault();
} }