From e8f19b4c0d774bd6f1942aa4557ad0be728b9a4f Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 8 Sep 2014 18:59:26 -0700 Subject: Display a 'Set Topic' button if there is no topic or it's a 0-len string. --- webclient/room/room-controller.js | 9 ++++++++- webclient/room/room.html | 22 +++++++++++++--------- 2 files changed, 21 insertions(+), 10 deletions(-) (limited to 'webclient/room') diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 10ff12a96b..68845df7d1 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -51,7 +51,14 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) console.log("Warning: Already editing topic."); return; } - $scope.topic.newTopicText = $rootScope.events.rooms[$scope.room_id]['m.room.topic'].content.topic; + var topicEvent = $rootScope.events.rooms[$scope.room_id]['m.room.topic']; + if (topicEvent) { + $scope.topic.newTopicText = topicEvent.content.topic; + } + else { + $scope.topic.newTopicText = ""; + } + $scope.topic.isEditing = true; }, updateTopic: function() { diff --git a/webclient/room/room.html b/webclient/room/room.html index 0fe45499e0..01f0c4ee33 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -6,16 +6,20 @@
{{ room_id | mRoomName }}
-
-
- {{ events.rooms[room_id]['m.room.topic'].content.topic | limitTo: 200}} +
+ +
+
+ {{ events.rooms[room_id]['m.room.topic'].content.topic | limitTo: 200}} +
+
+ +
- -
- -
-
-- cgit 1.5.1