From 0dac2f7a8d3394e681db29b020e99b80571f2fe5 Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Thu, 18 Sep 2014 19:12:21 +0200 Subject: Fixed missing component dependency which created a crash --- webclient/room/room-controller.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'webclient/room') diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index de50058743..cfdc6d0157 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -15,8 +15,8 @@ limitations under the License. */ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) -.controller('RoomController', ['$filter', '$scope', '$timeout', '$routeParams', '$location', '$rootScope', 'matrixService', 'eventHandlerService', 'mFileUpload', 'matrixPhoneService', 'MatrixCall', - function($filter, $scope, $timeout, $routeParams, $location, $rootScope, matrixService, eventHandlerService, mFileUpload, matrixPhoneService, MatrixCall) { +.controller('RoomController', ['$filter', '$scope', '$timeout', '$routeParams', '$location', '$rootScope', 'matrixService', 'mPresence', 'eventHandlerService', 'mFileUpload', 'matrixPhoneService', 'MatrixCall', + function($filter, $scope, $timeout, $routeParams, $location, $rootScope, matrixService, mPresence, eventHandlerService, mFileUpload, matrixPhoneService, MatrixCall) { 'use strict'; var MESSAGES_PER_PAGINATION = 30; var THUMBNAIL_SIZE = 320; @@ -189,7 +189,6 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) // Notify when a user joins if ((document.hidden || matrixService.presence.unavailable === mPresence.getState()) && event.state_key !== $scope.state.user_id && "join" === event.membership) { - debugger; var notification = new window.Notification( event.content.displayname + " (" + (matrixService.getRoomIdToAliasMapping(event.room_id) || event.room_id) + ")", // FIXME: don't leak room_ids here -- cgit 1.5.1 From 2ab7e23790e416f16ea3ba939dd6a91bb8cfa936 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 18 Sep 2014 18:17:27 +0100 Subject: fix SYWEB-41 (hopefully) --- webclient/room/room-controller.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'webclient/room') diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index cfdc6d0157..ac8f767d16 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -703,7 +703,13 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) if ($rootScope.events.rooms[$scope.room_id]) { // There is no need to do a 1st pagination (initialSync provided enough to fill a page) - $scope.state.first_pagination = false; + if ($rootScope.events.rooms[$scope.room_id].messages.length) { + $scope.state.first_pagination = false; + } + else { + // except if we just joined a room, we won't have this history from initial sync, so we should try to paginate it anyway + $scope.state.first_pagination = true; + } var members = $rootScope.events.rooms[$scope.room_id].members; -- cgit 1.5.1