SYWEB-12: More formatting.

pull/4/merge
Kegan Dougal 10 years ago
parent 40342af459
commit 6f3f631fd1
  1. 17
      webclient/app-directive.js
  2. 6
      webclient/app.css
  3. 6
      webclient/room/room-controller.js
  4. 10
      webclient/room/room.html

@ -40,4 +40,19 @@ angular.module('matrixWebClient')
}
}
};
}]);
}])
.directive('elastic', [ // http://stackoverflow.com/questions/17772260/textarea-auto-height
'$timeout',
function($timeout) {
return {
restrict: 'A',
link: function($scope, element) {
var resize = function() {
return element[0].style.height = "" + element[0].scrollHeight + "px";
};
element.on("blur keyup change", resize);
$timeout(resize, 10);
}
};
}
]);;

@ -443,6 +443,12 @@ textarea, input {
font-family: monospace;
}
.room-info-textarea-content {
height: auto;
width: 100%;
resize: vertical;
}
/*** Participant list ***/
#usersTableWrapper {

@ -1039,9 +1039,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
.controller('RoomInfoController', function($scope, $modalInstance, $filter) {
console.log("Displaying room info.");
$scope.submitState = function(eventType, content) {
console.log("Submitting " + eventType + " with " + content);
}
$scope.submit = function(event) {
console.error("submit >>> " + JSON.stringify(event));
};
$scope.dismiss = $modalInstance.dismiss;

@ -17,15 +17,19 @@
<div class="modal-body">
<table class="room-info">
<tr ng-repeat="(key, event) in events.rooms[room_id] | stateEventsFilter" class="room-info-event">
<td class="room-info-event-meta">
<td class="room-info-event-meta" width="30%">
<span class="monospace">{{ key }}</span>
<br/>
{{ (event.origin_server_ts) | date:'MMM d HH:mm' }}
<br/>
Set by: <span class="monospace">{{ event.user_id }}</span>
<br/>
<button ng-click="submit(event)" type="button" class="btn btn-success">
Submit
</button>
</td>
<td class="room-info-event-content">
<pre>{{ event.content | json }}</pre>
<td class="room-info-event-content" width="70%">
<textarea class="room-info-textarea-content" elastic ng-model="event.content | json"></textarea>
</td>
</tr>
</table>

Loading…
Cancel
Save