Browse Source

Fixed scroll to unread when idle

master
Igor Zhukov 10 years ago
parent
commit
a72400d3b3
  1. 2
      app/js/controllers.js
  2. 11
      app/js/directives.js

2
app/js/controllers.js

@ -1413,7 +1413,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) @@ -1413,7 +1413,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
$scope.historyState.typing.splice(0, $scope.historyState.typing.length);
$scope.$broadcast('ui_history_append_new', {
my: addedMessage.my,
noScroll: unreadAfterIdle && !historyMessage.out && $rootScope.idle.isIDLE
idleScroll: unreadAfterIdle && !historyMessage.out && $rootScope.idle.isIDLE
});
if (addedMessage.my && $scope.historyUnreadAfter) {
delete $scope.historyUnreadAfter;

11
app/js/directives.js

@ -872,10 +872,17 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -872,10 +872,17 @@ angular.module('myApp.directives', ['myApp.filters'])
curAnimation = false;
$scope.$on('ui_history_append_new', function (e, options) {
if (!atBottom && !options.my || options.noScroll) {
if (!atBottom && !options.my) {
onContentLoaded(function () {
$(historyWrap).nanoScroller();
})
});
return;
}
if (options.idleScroll) {
onContentLoaded(function () {
$(historyWrap).nanoScroller();
changeScroll();
});
return;
}
var curAnimated = animated &&

Loading…
Cancel
Save