r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Disabled scroll change on idle

Browse Source 
Fixed #666
This commit is contained in:
Igor Zhukov 2015-02-14 23:03:38 +03:00
parent 1ce4c0c3d4
commit edbb2e6d7f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/js/controllers.js
View File

@ -1393,7 +1393,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
if (curPeer) { if (curPeer) {
$scope.historyState.typing.splice(0, $scope.historyState.typing.length); $scope.historyState.typing.splice(0, $scope.historyState.typing.length);
$scope.$broadcast('ui_history_append_new', {my: addedMessage.my}); $scope.$broadcast('ui_history_append_new', {my: addedMessage.my, idle: $rootScope.idle.isIDLE});
if (addedMessage.my && $scope.historyUnreadAfter) { if (addedMessage.my && $scope.historyUnreadAfter) {
delete $scope.historyUnreadAfter; delete $scope.historyUnreadAfter;
$scope.$broadcast('messages_unread_after'); $scope.$broadcast('messages_unread_after');

2
app/js/directives.js
View File

@ -800,7 +800,7 @@ angular.module('myApp.directives', ['myApp.filters'])
curAnimation = false; curAnimation = false;
$scope.$on('ui_history_append_new', function (e, options) { $scope.$on('ui_history_append_new', function (e, options) {
if (!atBottom && !options.my) { if ((!atBottom || options.idle) && !options.my) {
return; return;
} }
var curAnimated = animated && var curAnimated = animated &&