Fix embedded.js ChatView

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Mar 25, 2019 · 396bcc7 · 396bcc7
1 parent 9ba28e4
commit 396bcc7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/js/embedded.js b/js/embedded.js
@@ -89,6 +89,7 @@
 						self._rooms.forEach(function(room) {
 							if (room.get('token') === token) {
 								self.activeRoom = room;
+								self._chatView.setRoom(room);
 							}
 						});
 					}
@@ -106,6 +107,7 @@
 			this._messageCollection = new OCA.SpreedMe.Models.ChatMessageCollection(null, {token: null});
 			this._chatView = new OCA.SpreedMe.Views.ChatView({
 				collection: this._messageCollection,
+				model: this.activeRoom,
 				id: 'chatView',
 				guestNameModel: this._localStorageModel
 			});

diff --git a/js/views/chatview.js b/js/views/chatview.js
@@ -192,7 +192,7 @@
 				this._addCommentTemplate = OCA.Talk.Views.Templates['chatview_add_comment'];
 			}
 
-			var isReadOnly = this.model.get('readOnly') === 1;
+			var isReadOnly = this.model && this.model.get('readOnly') === 1;
 			var newMessagePlaceholder = t('spreed', 'New message …');
 			var submitText = t('spreed', 'Send');
 			if (isReadOnly) {