diff options
author | Matthew Hodgson <matthew@matrix.org> | 2014-08-14 02:13:14 +0100 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2014-08-14 02:14:15 +0100 |
commit | 6c2db18be150eb6410f1e3a148057b81dcae8093 (patch) | |
tree | 02ab28453fa635ddb77e7c72989827bb6fabe04e /webclient/room/room-controller.js | |
parent | fix whitespace (diff) | |
download | synapse-6c2db18be150eb6410f1e3a148057b81dcae8093.tar.xz |
completely change the CSS to be an entirely 'position: absolute' layout rather than top-to-bottom. makes the overscroll much more predictable and sane and not dependent on CSS expressions.
Diffstat (limited to 'webclient/room/room-controller.js')
-rw-r--r-- | webclient/room/room-controller.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index a30f46baf8..470f41521a 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -42,6 +42,8 @@ angular.module('RoomController', []) console.log("Got response from "+$scope.state.events_from+" to "+response.data.end); $scope.state.events_from = response.data.end; + $scope.feedback = ""; + for (var i = 0; i < response.data.chunk.length; i++) { var chunk = response.data.chunk[i]; if (chunk.room_id == $scope.room_id && chunk.type == "m.room.message") { @@ -68,10 +70,12 @@ angular.module('RoomController', []) $timeout(shortPoll, 0); } }, function(response) { - $scope.feedback = "Can't stream: " + JSON.stringify(response); + $scope.feedback = "Can't stream: " + response.data; + if (response.status == 403) { $scope.stopPoll = true; } + if ($scope.stopPoll) { console.log("Stopping polling."); } |