diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-04-20 21:05:01 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-04-20 21:05:01 -0400 |
| commit | b96eb1c8230ae2f5986d6f22934c606bbca9728e (patch) | |
| tree | fecd2279927b61da28801094dc7d6b1cfa8d98fe /view | |
| parent | 7594796ee11c0b245d02d145868a13ac3d84ebfc (diff) | |
| parent | 635580091a227529cb491e6441a5acbfff3177be (diff) | |
| download | volse-hubzilla-b96eb1c8230ae2f5986d6f22934c606bbca9728e.tar.gz volse-hubzilla-b96eb1c8230ae2f5986d6f22934c606bbca9728e.tar.bz2 volse-hubzilla-b96eb1c8230ae2f5986d6f22934c606bbca9728e.zip | |
Merge branch 'dev' into toggle-context-help
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 4 | ||||
| -rw-r--r-- | view/js/autocomplete.js | 8 | ||||
| -rw-r--r-- | view/js/main.js | 10 |
3 files changed, 14 insertions, 8 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(); + } } }); }; diff --git a/view/js/main.js b/view/js/main.js index 799ae82bc..2813b3b19 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -372,11 +372,11 @@ function NavUpdate() { if(! updateCountsOnly) { // start live update - if($('#live-network').length) { src = 'network'; liveUpdate(); } - if($('#live-channel').length) { src = 'channel'; liveUpdate(); } - if($('#live-public').length) { src = 'public'; liveUpdate(); } - if($('#live-display').length) { src = 'display'; liveUpdate(); } - if($('#live-search').length) { src = 'search'; liveUpdate(); } + if($('#live-network').length) { src = 'network'; liveUpdate(); } + if($('#live-channel').length) { src = 'channel'; liveUpdate(); } + if($('#live-pubstream').length) { src = 'pubstream'; liveUpdate(); } + if($('#live-display').length) { src = 'display'; liveUpdate(); } + if($('#live-search').length) { src = 'search'; liveUpdate(); } if($('#live-photos').length) { if(liking) { |