Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Emmanuel ROHEE 2014-09-15 10:08:47 +02:00
commit 3292f70071
3 changed files with 6 additions and 3 deletions

View File

@ -5,3 +5,5 @@ Broad-sweeping stuff which would be nice to have
- homeserver implementation in go
- homeserver implementation in node.js
- client SDKs
- libpurple library
- irssi plugin?

View File

@ -529,7 +529,8 @@ a:active { color: #000; }
.bubble .message {
/* Break lines when encountering CR+LF */
white-space: pre;
/* FIXME: this breaks wordwrapping. We need to s#CRLF#<br/>#g instead */
/* white-space: pre; */
}
.bubble .messagePending {
opacity: 0.3

View File

@ -220,7 +220,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
};
var paginate = function(numItems) {
// console.log("paginate " + numItems);
//console.log("paginate " + numItems + " and first_pagination is " + $scope.state.first_pagination);
if ($scope.state.paginating || !$scope.room_id) {
return;
}
@ -260,7 +260,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
}
if ($scope.state.first_pagination) {
scrollToBottom();
scrollToBottom(true);
$scope.state.first_pagination = false;
}
else {