Merged Alexander's patch again

asafdav · May 14, 2014 · 80287ab · 80287ab
1 parent 40c2158
commit 80287ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/dist/ng-scrollbar.js b/dist/ng-scrollbar.js
@@ -74,6 +74,7 @@ angular.module('ngScrollbar', []).directive('ngScrollbar', [
           redraw();
         };
         var buildScrollbar = function (rollToBottom) {
+          var parentOffsetTop = element[0].parentElement.offsetTop;
           var wheelEvent = win[0].onmousewheel !== undefined ? 'mousewheel' : 'DOMMouseScroll';
           rollToBottom = flags.bottom || rollToBottom;
           mainElm = angular.element(element.children()[0]);
@@ -82,7 +83,7 @@ angular.module('ngScrollbar', []).directive('ngScrollbar', [
           thumb = angular.element(angular.element(tools.children()[0]).children()[0]);
           thumbLine = angular.element(thumb.children()[0]);
           track = angular.element(angular.element(tools.children()[0]).children()[1]);
-          page.height = element[0].offsetHeight;
+          page.height = element[0].offsetHeight - parentOffsetTop;
           page.scrollHeight = transculdedContainer[0].scrollHeight;
           if (page.height < page.scrollHeight) {
             scope.showYScrollbar = true;

diff --git a/dist/ng-scrollbar.min.js b/dist/ng-scrollbar.min.js
diff --git a/src/ng-scrollbar.js b/src/ng-scrollbar.js
@@ -112,6 +112,9 @@ angular.module('ngScrollbar', []).
 
         var buildScrollbar = function(rollToBottom) {
 
+          // Getting top position of a parent element to place scroll correctly
+          var parentOffsetTop = element[0].parentElement.offsetTop;
+
           var wheelEvent = win[0].onmousewheel !== undefined ? 'mousewheel' : 'DOMMouseScroll';
 
           rollToBottom = flags.bottom || rollToBottom;
@@ -123,7 +126,7 @@ angular.module('ngScrollbar', []).
           track = angular.element(angular.element(tools.children()[0]).children()[1]);
 
           // Check if scroll bar is needed
-          page.height = element[0].offsetHeight ;
+          page.height = element[0].offsetHeight - parentOffsetTop;
           page.scrollHeight = transculdedContainer[0].scrollHeight;
 
           if (page.height < page.scrollHeight) {