Browse Source

Fixed scroll bug

master
Igor Zhukov 10 years ago
parent
commit
c414e9c33c
  1. 5
      app/js/directives.js

5
app/js/directives.js

@ -469,6 +469,7 @@ angular.module('myApp.directives', ['myApp.filters'])
atBottom = false; atBottom = false;
} else { } else {
scrollableWrap.scrollTop = scrollableWrap.scrollHeight; scrollableWrap.scrollTop = scrollableWrap.scrollHeight;
atBottom = true;
} }
updateScroller(); updateScroller();
$timeout(function () { $timeout(function () {
@ -515,7 +516,7 @@ angular.module('myApp.directives', ['myApp.filters'])
$(scrollableWrap).removeClass('im_history_to_bottom'); $(scrollableWrap).removeClass('im_history_to_bottom');
$(scrollable).css({bottom: '', marginLeft: ''}); $(scrollable).css({bottom: '', marginLeft: ''});
scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh; scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh;
updateBottomizer(); updateBottomizer();
moreNotified = false; moreNotified = false;
@ -596,7 +597,7 @@ angular.module('myApp.directives', ['myApp.filters'])
}); });
function updateSizes (heightOnly) { function updateSizes (heightOnly) {
if (!element.is(':visible') || !$(element[0].parentNode).is(':visible')) { if (!element.is(':visible') && !$(element[0].parentNode.parentNode).is(':visible')) {
return; return;
} }
if ($(sendFormWrap).is(':visible')) { if ($(sendFormWrap).is(':visible')) {

Loading…
Cancel
Save