aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-20 17:43:20 -0700
committerredmatrix <git@macgirvin.com>2016-04-20 17:43:20 -0700
commit635580091a227529cb491e6441a5acbfff3177be (patch)
treefc105e2ae8d950ecfa9985ecfea9f86068029e57
parenta768bb1ab22ae0d7277778501487a67d4bcf093b (diff)
parent59799ba2b4c8aa9958e2333a6ed2f17b08df82bf (diff)
downloadvolse-hubzilla-635580091a227529cb491e6441a5acbfff3177be.tar.gz
volse-hubzilla-635580091a227529cb491e6441a5acbfff3177be.tar.bz2
volse-hubzilla-635580091a227529cb491e6441a5acbfff3177be.zip
Merge branch 'master' into dev
-rw-r--r--view/css/conversation.css4
-rw-r--r--view/js/autocomplete.js8
2 files changed, 9 insertions, 3 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 5cbd5c896..0ecec039f 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -196,8 +196,10 @@ a.wall-item-name-link {
/* comment_item */
-.comment-edit-text-empty, .comment-edit-text-full {
+.comment-edit-text-empty,
+.comment-edit-text-full {
width: 100%;
+ display: inherit;
}
.comment-edit-text-empty {
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 59e3600b3..84cc075dc 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -147,6 +147,9 @@ function listNewLineAutocomplete(id) {
setCaretPosition(text, caretPos + 5);
return true;
}
+ else {
+ return false;
+ }
}
function string2bb(element) {
@@ -315,11 +318,12 @@ function string2bb(element) {
a.on('textComplete:select', function(e, value, strategy) { value; });
a.keypress(function(e){
- e.stopImmediatePropagation();
if (e.keyCode == 13) {
var x = listNewLineAutocomplete(this.id);
- if(x)
+ if(x) {
+ e.stopImmediatePropagation();
e.preventDefault();
+ }
}
});
};