diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-10-31 17:13:27 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-10-31 17:13:27 +0000 |
| commit | f21960ec9d346d53a21369b8179cc30365654517 (patch) | |
| tree | 7ae51a7880f64fe612a247395861eaa99c99ded7 /webclient/room/room.html | |
| parent | room.html now displays messages from model-service. Add debugging fields. Hoo... (diff) | |
| download | synapse-f21960ec9d346d53a21369b8179cc30365654517.tar.xz | |
Replace lots of .events.rooms[room_id] with .room
Diffstat (limited to '')
| -rw-r--r-- | webclient/room/room.html | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index 8c1e45dfd4..1cec8ac70b 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -6,7 +6,7 @@ </div> <div class="modal-footer"> <button ng-click="redact()" type="button" class="btn btn-danger" - ng-disabled="!events.rooms[room_id]['m.room.ops_levels'].content.redact_level || !pow(room_id, state.user_id) || pow(room_id, state.user_id) < events.rooms[room_id]['m.room.ops_levels'].content.redact_level" + ng-disabled="!room.current_room.state.state_events['m.room.ops_levels'].content.redact_level || !pow(room_id, state.user_id) || pow(room_id, state.user_id) < room.current_room.state.state_events['m.room.ops_levels'].content.redact_level" title="Delete this event on all home servers. This cannot be undone."> Redact </button> @@ -18,7 +18,8 @@ <table class="room-info"> <tr ng-repeat="(key, event) in roomInfo.stateEvents" class="room-info-event"> <td class="room-info-event-meta" width="30%"> - <span class="monospace">{{ key }}</span> + <span class="monospace">{{ event.type }}</span> + <span ng-show="event.state_key" class="monospace"> ({{event.state_key}})</span> <br/> {{ (event.origin_server_ts) | date:'MMM d HH:mm' }} <br/> @@ -68,13 +69,13 @@ </div> <div class="roomTopicSection"> - <button ng-hide="events.rooms[room_id]['m.room.topic'].content.topic || topic.isEditing" + <button ng-hide="room.current_room_state.state_events['m.room.topic'].content.topic || topic.isEditing" ng-click="topic.editTopic()" class="roomTopicSetNew"> Set Topic </button> - <div ng-show="events.rooms[room_id]['m.room.topic'].content.topic || topic.isEditing"> + <div ng-show="room.current_room_state.state_events['m.room.topic'].content.topic || topic.isEditing"> <div ng-hide="topic.isEditing" ng-dblclick="topic.editTopic()" id="roomTopic"> - {{ events.rooms[room_id]['m.room.topic'].content.topic | limitTo: 200}} + {{ room.current_room_state.state_events['m.room.topic'].content.topic | limitTo: 200}} </div> <form ng-submit="topic.updateTopic()" ng-show="topic.isEditing" class="roomTopicForm"> <input ng-model="topic.newTopicText" ng-blur="topic.cancelEdit()" class="roomTopicInput" placeholder="Topic"/> |