forked from MirrorHub/synapse
BF: edit the actual room name not the displayed room name (which has been computed)
This commit is contained in:
parent
9aed6a06cf
commit
fe7af80198
|
@ -53,8 +53,13 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
|
|||
return;
|
||||
};
|
||||
|
||||
// Use the filter applied in html to set the input value
|
||||
$scope.name.newNameText = $filter('mRoomName')($scope.room_id);
|
||||
var nameEvent = $rootScope.events.rooms[$scope.room_id]['m.room.name'];
|
||||
if (nameEvent) {
|
||||
$scope.name.newNameText = nameEvent.content.name;
|
||||
}
|
||||
else {
|
||||
$scope.name.newNameText = "";
|
||||
}
|
||||
|
||||
// Force focus to the input
|
||||
$timeout(function() {
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
{{ room_id | mRoomName }}
|
||||
</div>
|
||||
<form ng-submit="name.updateName()" ng-show="name.isEditing" class="roomNameForm">
|
||||
<input ng-model="name.newNameText" ng-blur="name.cancelEdit()" class="roomNameInput" />
|
||||
<input ng-model="name.newNameText" ng-blur="name.cancelEdit()" class="roomNameInput" placeholder="Room name"/>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
|||
{{ events.rooms[room_id]['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" />
|
||||
<input ng-model="topic.newTopicText" ng-blur="topic.cancelEdit()" class="roomTopicInput" placeholder="Topic"/>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue