Skip to content

Commit

Permalink
fix(scroll): calculate padding-bottom
Browse files Browse the repository at this point in the history
Closes #2174
  • Loading branch information
adamdbradley committed Sep 10, 2014
1 parent fbcd00a commit ba3600d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions js/views/scrollView.js
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
return Math.max(self.__content.scrollWidth, self.__content.offsetWidth);
},
getContentHeight: function() {
return Math.max(self.__content.scrollHeight, self.__content.offsetHeight + self.__content.offsetTop);
return Math.max(self.__content.scrollHeight, self.__content.offsetHeight + (self.__content.offsetTop * 2));
}
};

Expand Down Expand Up @@ -906,7 +906,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
this.mouseMove = this.mouseDown = this.mouseUp = this.mouseWheel =
this.touchStart = this.touchMove = this.touchEnd = this.touchCancel = angular.noop;

this.resize = this.scrollTo = this.zoomTo =
this.resize = this.scrollTo = this.zoomTo =
this.__scrollingComplete = angular.noop;
container = null;
},
Expand Down

0 comments on commit ba3600d

Please sign in to comment.