OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Formatting

paul/schema_breaking_changes
Kegan Dougal 2014-08-15 17:58:51 +01:00
parent 0e6a2f87f9
commit 60a9f27edb
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
webclient/room/room-controller.js
View File

@ -16,30 +16,30 @@ limitations under the License.
angular.module('RoomController', []) angular.module('RoomController', [])
// FIXME move directives outta here! // FIXME move directives outta here!
.directive("keepScroll", function(){ .directive("keepScroll", function() {
return { return {
controller : function($scope){ controller : function($scope) {
var element = 0; var element = 0;
this.setElement = function(el){ this.setElement = function(el){
element = el; element = el;
} }
this.addItem = function(item){ this.addItem = function(item){
element.scrollTop = (element.scrollTop+item.clientHeight+1); //1px for margin element.scrollTop = (element.scrollTop + item.clientHeight);
}; };
}, },
link : function(scope,el,attr, ctrl) { link : function(scope, el, attr, ctrl) {
ctrl.setElement(el[0]); ctrl.setElement(el[0]);
} }
}; };
}) })
// FIXME move directives outta here! // FIXME move directives outta here!
.directive("scrollItem", function(){ .directive("scrollItem", function(){
return{ return {
require : "^keepScroll", require : "^keepScroll",
link : function(scope, el, att, scrCtrl){ link : function(scope, el, att, scrCtrl){
scrCtrl.addItem(el[0]); scrCtrl.addItem(el[0]);
}
} }
}
}) })
.controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', .controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService',
function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService) { function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService) {

3
webclient/room/room.html
View File

@ -63,7 +63,7 @@
<button ng-click="send()">Send</button> <button ng-click="send()">Send</button>
</td> </td>
<td width="1"> <td width="1">
{{ feedback }}
</td> </td>
</tr> </tr>
<tr> <tr>
@ -87,6 +87,7 @@
</span> </span>
<button ng-click="leaveRoom()">Leave</button> <button ng-click="leaveRoom()">Leave</button>
<button ng-click="loadMoreHistory()" ng-disabled="!state.can_paginate">Load more history</button> <button ng-click="loadMoreHistory()" ng-disabled="!state.can_paginate">Load more history</button>
{{ feedback }}
<div ng-hide="!state.stream_failure"> <div ng-hide="!state.stream_failure">
{{ state.stream_failure.data.error || "Connection failure" }} {{ state.stream_failure.data.error || "Connection failure" }}
</div> </div>