diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 7de50dd960..3311618825 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', 'mUtilities'])
-.controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', 'mFileUpload', 'mUtilities',
- function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService, mFileUpload, mUtilities) {
+.controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', 'mFileUpload', 'mUtilities', '$rootScope',
+ function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService, mFileUpload, mUtilities, $rootScope) {
'use strict';
var MESSAGES_PER_PAGINATION = 30;
var THUMBNAIL_SIZE = 320;
@@ -29,9 +29,11 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
user_id: matrixService.config().user_id,
events_from: "END", // when to start the event stream from.
earliest_token: "END", // stores how far back we've paginated.
+ first_pagination: true, // this is toggled off when the first pagination is done
can_paginate: true, // this is toggled off when we run out of items
paginating: false, // used to avoid concurrent pagination requests pulling in dup contents
stream_failure: undefined, // the response when the stream fails
+ // FIXME: sending has been disabled, as surely messages should be sent in the background rather than locking the UI synchronously --Matthew
sending: false // true when a message is being sent. It helps to disable the UI when a process is running
};
$scope.members = {};
@@ -100,7 +102,6 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
var originalTopRow = $("#messageTable>tbody>tr:first")[0];
matrixService.paginateBackMessages($scope.room_id, $scope.state.earliest_token, numItems).then(
function(response) {
- var firstPagination = !$scope.events.rooms[$scope.room_id];
eventHandlerService.handleEvents(response.data.chunk, false);
$scope.state.earliest_token = response.data.end;
if (response.data.chunk.length < MESSAGES_PER_PAGINATION) {
@@ -126,8 +127,9 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
}, 0);
}
- if (firstPagination) {
+ if ($scope.state.first_pagination) {
scrollToBottom();
+ $scope.state.first_pagination = false;
}
else {
// lock the scroll position
@@ -150,6 +152,8 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
};
var updateMemberList = function(chunk) {
+ if (chunk.room_id != $scope.room_id) return;
+
var isNewMember = !(chunk.target_user_id in $scope.members);
if (isNewMember) {
// FIXME: why are we copying these fields around inside chunk?
@@ -159,8 +163,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
if ("mtime_age" in chunk.content) {
chunk.mtime_age = chunk.content.mtime_age;
}
-/*
- // FIXME: once the HS reliably returns the displaynames & avatar_urls for both
+ // Once the HS reliably returns the displaynames & avatar_urls for both
// local and remote users, we should use this rather than the evalAsync block
// below
if ("displayname" in chunk.content) {
@@ -169,9 +172,11 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
if ("avatar_url" in chunk.content) {
chunk.avatar_url = chunk.content.avatar_url;
}
- */
$scope.members[chunk.target_user_id] = chunk;
+/*
+ // Stale code for explicitly hammering the homeserver for every displayname & avatar_url
+
// get their display name and profile picture and set it to their
// member entry in $scope.members. We HAVE to use $timeout with 0 delay
// to make this function run AFTER the current digest cycle, else the
@@ -195,6 +200,11 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
}
);
});
+*/
+
+ if (chunk.target_user_id in $rootScope.presence) {
+ updatePresence($rootScope.presence[chunk.target_user_id]);
+ }
}
else {
// selectively update membership else it will nuke the picture and displayname too :/
@@ -236,7 +246,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
}
$scope.state.sending = true;
-
+
// Send the text message
var promise;
// FIXME: handle other commands too
@@ -260,9 +270,8 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
};
$scope.onInit = function() {
- // $timeout(function() { document.getElementById('textInput').focus() }, 0);
console.log("onInit");
-
+
// Does the room ID provided in the URL?
var room_id_or_alias;
if ($routeParams.room_id_or_alias) {
@@ -290,7 +299,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
else {
// In case of issue, go to the default page
console.log("Error: cannot extract room alias");
- $location.path("/");
+ $location.url("/");
return;
}
}
@@ -307,12 +316,14 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
function () {
// In case of issue, go to the default page
console.log("Error: cannot resolve room alias");
- $location.path("/");
+ $location.url("/");
});
}
};
var onInit2 = function() {
+ eventHandlerService.reInitRoom($scope.room_id);
+
// Join the room
matrixService.join($scope.room_id).then(
function() {
@@ -325,6 +336,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
var chunk = response.data.chunk[i];
updateMemberList(chunk);
}
+ eventStreamService.resume();
},
function(error) {
$scope.feedback = "Failed get member list: " + error.data.error;
@@ -360,7 +372,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
matrixService.leave($scope.room_id).then(
function(response) {
console.log("Left room ");
- $location.path("rooms");
+ $location.url("home");
},
function(error) {
$scope.feedback = "Failed to leave room: " + error.data.error;
|
