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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
redmatrix 2016-04-20 17:43:20 -07:00
commit 635580091a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/css/conversation.css
View File

@ -196,8 +196,10 @@ a.wall-item-name-link {
/* comment_item */ /* comment_item */
.comment-edit-text-empty, .comment-edit-text-full { .comment-edit-text-empty,
.comment-edit-text-full {
width: 100%; width: 100%;
display: inherit;
} }
.comment-edit-text-empty { .comment-edit-text-empty {

8
view/js/autocomplete.js
View File

@ -147,6 +147,9 @@ function listNewLineAutocomplete(id) {
setCaretPosition(text, caretPos + 5); setCaretPosition(text, caretPos + 5);
return true; return true;
} }
else {
return false;
}
} }
function string2bb(element) { function string2bb(element) {
@ -315,11 +318,12 @@ function string2bb(element) {
a.on('textComplete:select', function(e, value, strategy) { value; }); a.on('textComplete:select', function(e, value, strategy) { value; });
a.keypress(function(e){ a.keypress(function(e){
e.stopImmediatePropagation();
if (e.keyCode == 13) { if (e.keyCode == 13) {
var x = listNewLineAutocomplete(this.id); var x = listNewLineAutocomplete(this.id);
if(x) if(x) {
e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
}
} }
}); });
}; };