Skip to content

Commit

Permalink
Merge pull request #173 from jimmay5469/custom-scrollable-fix
Browse files Browse the repository at this point in the history
Fix loader with custom scrollable that never fires
  • Loading branch information
hhff authored Aug 5, 2016
2 parents 36deba6 + fb8be0a commit f0b823d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion addon/components/infinity-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const InfinityLoaderComponent = Ember.Component.extend({

_selfOffset() {
if (this.get('_customScrollableIsDefined')) {
return this.$().position().top + this.get("_scrollable").scrollTop();
return this.$().offset().top - this.get("_scrollable").offset().top + this.get("_scrollable").scrollTop();
} else {
return this.$().offset().top;
}
Expand Down

0 comments on commit f0b823d

Please sign in to comment.