From 2a4e8972e0edfa3156d9ce54d68ce0e54c0ec289 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 18 Apr 2016 20:38:38 -0700
Subject: module updates

---
 view/js/main.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'view')

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) {
-- 
cgit v1.2.3


From 8147e6203f863d27c6e479cd096b71a940c4f58e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 20 Apr 2016 14:13:09 +0200
Subject: Use stopImmidiatePropagation() only if we are in a list to not
 interfere with other keypress listeners (e.g. chat).

---
 view/js/autocomplete.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'view')

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();
+				}
 			}
 		});
 	};
-- 
cgit v1.2.3


From 59799ba2b4c8aa9958e2333a6ed2f17b08df82bf Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 20 Apr 2016 21:59:29 +0200
Subject: some crossbrowser rendering work on the comment box

---
 view/css/conversation.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'view')

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 {
-- 
cgit v1.2.3