angular2-infinite-scroll - npm Package Compare versions

Comparing version 0.1.5 to 0.1.7

bundles/angular2-infinite-scroll.js

@@ -33,2 +33,4 @@ System.registerDynamic("src/infinite-scroll", ["@angular/core", "./scroller"], true, function($__require, exports, module) {
       this._immediate = false;
+      this._horizontal = false;
+      this._alwaysCallback = false;
       this.scrolled = new core_1.EventEmitter();
@@ -39,3 +41,3 @@ this.scrolledUp = new core_1.EventEmitter();
       var containerElement = this.scrollWindow ? window : this.element;
-      this.scroller = new scroller_1.Scroller(containerElement, setInterval, this.element, this.onScrollDown.bind(this), this.onScrollUp.bind(this), this._distanceDown, this._distanceUp, {}, this._throttle, this._immediate);
+      this.scroller = new scroller_1.Scroller(containerElement, setInterval, this.element, this.onScrollDown.bind(this), this.onScrollUp.bind(this), this._distanceDown, this._distanceUp, {}, this._throttle, this._immediate, this._horizontal, this._alwaysCallback);
     };
@@ -45,7 +47,13 @@ InfiniteScroll.prototype.ngOnDestroy = function() {
     };
-    InfiniteScroll.prototype.onScrollDown = function() {
-      this.scrolled.next({});
+    InfiniteScroll.prototype.onScrollDown = function(data) {
+      if (data === void 0) {
+        data = {};
+      }
+      this.scrolled.next(data);
     };
-    InfiniteScroll.prototype.onScrollUp = function() {
-      this.scrolledUp.next({});
+    InfiniteScroll.prototype.onScrollUp = function(data) {
+      if (data === void 0) {
+        data = {};
+      }
+      this.scrolledUp.next(data);
     };
@@ -60,7 +68,10 @@ InfiniteScroll.prototype.handleScroll = function(event) {
     __decorate([core_1.Input('immediateCheck'), __metadata('design:type', Boolean)], InfiniteScroll.prototype, "_immediate", void 0);
+    __decorate([core_1.Input('horizontal'), __metadata('design:type', Boolean)], InfiniteScroll.prototype, "_horizontal", void 0);
+    __decorate([core_1.Input('alwaysCallback'), __metadata('design:type', Boolean)], InfiniteScroll.prototype, "_alwaysCallback", void 0);
     __decorate([core_1.Output(), __metadata('design:type', Object)], InfiniteScroll.prototype, "scrolled", void 0);
     __decorate([core_1.Output(), __metadata('design:type', Object)], InfiniteScroll.prototype, "scrolledUp", void 0);
     __decorate([core_1.HostListener('scroll', ['$event']), __metadata('design:type', Function), __metadata('design:paramtypes', [Object]), __metadata('design:returntype', void 0)], InfiniteScroll.prototype, "handleScroll", null);
-    InfiniteScroll = __decorate([core_1.Directive({selector: '[infinite-scroll]'}), __metadata('design:paramtypes', [core_1.ElementRef])], InfiniteScroll);
+    InfiniteScroll = __decorate([core_1.Directive({selector: '[infinite-scroll]'}), __metadata('design:paramtypes', [(typeof(_a = typeof core_1.ElementRef !== 'undefined' && core_1.ElementRef) === 'function' && _a) || Object])], InfiniteScroll);
     return InfiniteScroll;
+    var _a;
   }());
@@ -71,3 +82,3 @@ exports.InfiniteScroll = InfiniteScroll;
 
-System.registerDynamic("src/scroller", ["rxjs/Rx"], true, function($__require, exports, module) {
+System.registerDynamic("src/axis-resolver", [], true, function($__require, exports, module) {
   "use strict";
@@ -78,5 +89,47 @@ ;
       GLOBAL = this;
+  var AxisResolver = (function() {
+    function AxisResolver(vertical) {}
+    AxisResolver.prototype.clientHeightKey = function() {
+      return this.vertical ? 'clientHeight' : 'clientWidth';
+    };
+    AxisResolver.prototype.offsetHeightKey = function() {
+      return this.vertical ? 'offsetHeight' : 'offsetWidth';
+    };
+    AxisResolver.prototype.scrollHeightKey = function() {
+      return this.vertical ? 'scrollHeight' : 'scrollWidth';
+    };
+    AxisResolver.prototype.pageYOffsetKey = function() {
+      return this.vertical ? 'pageYOffset' : 'pageXOffset';
+    };
+    AxisResolver.prototype.offsetTopKey = function() {
+      return this.vertical ? 'offsetTop' : 'offsetLeft';
+    };
+    AxisResolver.prototype.scrollTopKey = function() {
+      return this.vertical ? 'scrollTop' : 'scrollLeft';
+    };
+    AxisResolver.prototype.topKey = function() {
+      return this.vertical ? 'top' : 'left';
+    };
+    return AxisResolver;
+  }());
+  exports.AxisResolver = AxisResolver;
+  return module.exports;
+});
+
+System.registerDynamic("src/scroller", ["rxjs/Rx", "./axis-resolver"], true, function($__require, exports, module) {
+  "use strict";
+  ;
+  var define,
+      global = this,
+      GLOBAL = this;
   var Rx_1 = $__require('rxjs/Rx');
+  var axis_resolver_1 = $__require('./axis-resolver');
   var Scroller = (function() {
-    function Scroller(windowElement, $interval, $elementRef, infiniteScrollDownCallback, infiniteScrollUpCallback, infiniteScrollDownDistance, infiniteScrollUpDistance, infiniteScrollParent, infiniteScrollThrottle, isImmediate) {
+    function Scroller(windowElement, $interval, $elementRef, infiniteScrollDownCallback, infiniteScrollUpCallback, infiniteScrollDownDistance, infiniteScrollUpDistance, infiniteScrollParent, infiniteScrollThrottle, isImmediate, horizontal, alwaysCallback) {
+      if (horizontal === void 0) {
+        horizontal = false;
+      }
+      if (alwaysCallback === void 0) {
+        alwaysCallback = false;
+      }
       this.windowElement = windowElement;
@@ -89,2 +142,4 @@ this.$interval = $interval;
       this.isImmediate = isImmediate;
+      this.horizontal = horizontal;
+      this.alwaysCallback = alwaysCallback;
       this.lastScrollPosition = 0;
@@ -97,2 +152,3 @@ this.isContainerWindow = toString.call(this.windowElement).includes('Window');
       this.createInterval();
+      this.axis = new axis_resolver_1.AxisResolver(!this.horizontal);
     }
@@ -115,21 +171,27 @@ Scroller.prototype.defineContainer = function() {
     Scroller.prototype.height = function(elem) {
-      if (isNaN(elem.offsetHeight)) {
-        return this.documentElement.clientHeight;
+      var offsetHeight = this.axis.offsetHeightKey();
+      var clientHeight = this.axis.clientHeightKey();
+      if (isNaN(elem[offsetHeight])) {
+        return this.documentElement[clientHeight];
       } else {
-        return elem.offsetHeight;
+        return elem[offsetHeight];
       }
     };
     Scroller.prototype.offsetTop = function(elem) {
+      var top = this.axis.topKey();
       if (!elem.getBoundingClientRect) {
         return;
       }
-      return elem.getBoundingClientRect().top + this.pageYOffset(elem);
+      return elem.getBoundingClientRect()[top] + this.pageYOffset(elem);
     };
     Scroller.prototype.pageYOffset = function(elem) {
-      if (isNaN(window.pageYOffset)) {
-        return this.documentElement.scrollTop;
+      var pageYOffset = this.axis.pageYOffsetKey();
+      var scrollTop = this.axis.scrollTopKey();
+      var offsetTop = this.axis.offsetTopKey();
+      if (isNaN(window[pageYOffset])) {
+        return this.documentElement[scrollTop];
       } else if (elem.ownerDocument) {
-        return elem.ownerDocument.defaultView.pageYOffset;
+        return elem.ownerDocument.defaultView[pageYOffset];
       } else {
-        elem.offsetTop;
+        return elem[offsetTop];
       }
@@ -151,3 +213,3 @@ };
       var shouldScroll = remaining <= containerBreakpoint;
-      var triggerCallback = shouldScroll && this.scrollEnabled;
+      var triggerCallback = (this.alwaysCallback || shouldScroll) && this.scrollEnabled;
       var shouldClearInterval = shouldScroll && this.checkInterval;
@@ -157,5 +219,5 @@ this.checkWhenEnabled = shouldScroll;
         if (scrollingDown) {
-          this.infiniteScrollDownCallback();
+          this.infiniteScrollDownCallback({currentScrollPosition: container.scrolledUntilNow});
         } else {
-          this.infiniteScrollUpCallback();
+          this.infiniteScrollUpCallback({currentScrollPosition: container.scrolledUntilNow});
         }
@@ -181,4 +243,6 @@ }
     Scroller.prototype.calculatePointsForElement = function() {
+      var scrollTop = this.axis.scrollTopKey();
+      var scrollHeight = this.axis.scrollHeightKey();
       var height = this.height(this.container);
-      var scrolledUntilNow = this.container.scrollTop;
+      var scrolledUntilNow = this.container[scrollTop];
       var containerTopOffset = 0;
@@ -189,3 +253,3 @@ var offsetTop = this.offsetTop(this.container);
       }
-      var totalToScroll = this.container.scrollHeight;
+      var totalToScroll = this.container[scrollHeight];
       return {
@@ -192,0 +256,0 @@ height: height,

karma.conf.js

@@ -46,3 +46,3 @@ const isDebug = process.env.DEBUG || false;
       // paths to support debugging with source maps in dev tools
-      {pattern: 'src/**/*.ts', included: false, watched: false},
+      {pattern: 'src/**/*.ts', included: false, watched: false}
       // if we swtich to sourcemap files
@@ -49,0 +49,0 @@ // {pattern: 'src/**/*.js.map', included: false, watched: false},

package.json

 {
   "name": "angular2-infinite-scroll",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "An infinite scroll directive for angular2",
@@ -28,7 +28,7 @@ "main": "angular2-infinite-scroll.js",
   "devDependencies": {
-    "@angular/common": "2.0.0-rc.1",
-    "@angular/compiler": "2.0.0-rc.1",
-    "@angular/core": "^2.0.0-rc.1",
-    "@angular/platform-browser": "2.0.0-rc.1",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.1",
+    "@angular/common": "^2.0.0-rc.2",
+    "@angular/compiler": "^2.0.0-rc.2",
+    "@angular/core": "^2.0.0-rc.2",
+    "@angular/platform-browser": "^2.0.0-rc.2",
+    "@angular/platform-browser-dynamic": "^2.0.0-rc.2",
     "autodts": "0.0.6",
@@ -35,0 +35,0 @@ "es6-promise": "^3.0.2",

src/infinite-scroll.js

@@ -21,2 +21,4 @@ "use strict";
         this._immediate = false;
+        this._horizontal = false;
+        this._alwaysCallback = false;
         this.scrolled = new core_1.EventEmitter();
@@ -27,3 +29,3 @@ this.scrolledUp = new core_1.EventEmitter();
         var containerElement = this.scrollWindow ? window : this.element;
-        this.scroller = new scroller_1.Scroller(containerElement, setInterval, this.element, this.onScrollDown.bind(this), this.onScrollUp.bind(this), this._distanceDown, this._distanceUp, {}, this._throttle, this._immediate);
+        this.scroller = new scroller_1.Scroller(containerElement, setInterval, this.element, this.onScrollDown.bind(this), this.onScrollUp.bind(this), this._distanceDown, this._distanceUp, {}, this._throttle, this._immediate, this._horizontal, this._alwaysCallback);
     };
@@ -33,7 +35,9 @@ InfiniteScroll.prototype.ngOnDestroy = function () {
     };
-    InfiniteScroll.prototype.onScrollDown = function () {
-        this.scrolled.next({});
+    InfiniteScroll.prototype.onScrollDown = function (data) {
+        if (data === void 0) { data = {}; }
+        this.scrolled.next(data);
     };
-    InfiniteScroll.prototype.onScrollUp = function () {
-        this.scrolledUp.next({});
+    InfiniteScroll.prototype.onScrollUp = function (data) {
+        if (data === void 0) { data = {}; }
+        this.scrolledUp.next(data);
     };
@@ -64,2 +68,10 @@ InfiniteScroll.prototype.handleScroll = function (event) {
     __decorate([
+        core_1.Input('horizontal'), 
+        __metadata('design:type', Boolean)
+    ], InfiniteScroll.prototype, "_horizontal", void 0);
+    __decorate([
+        core_1.Input('alwaysCallback'), 
+        __metadata('design:type', Boolean)
+    ], InfiniteScroll.prototype, "_alwaysCallback", void 0);
+    __decorate([
         core_1.Output(), 
@@ -87,2 +99,2 @@ __metadata('design:type', Object)
 exports.InfiniteScroll = InfiniteScroll;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5maW5pdGUtc2Nyb2xsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW5maW5pdGUtc2Nyb2xsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxxQkFBb0csZUFBZSxDQUFDLENBQUE7QUFDcEgseUJBQXlCLFlBQVksQ0FBQyxDQUFBO0FBS3RDO0lBWUUsd0JBQW9CLE9BQW1CO1FBQW5CLFlBQU8sR0FBUCxPQUFPLENBQVk7UUFUTixrQkFBYSxHQUFXLENBQUMsQ0FBQztRQUN4QixnQkFBVyxHQUFXLEdBQUcsQ0FBQztRQUM1QixjQUFTLEdBQVcsQ0FBQyxDQUFDO1FBQ2hDLGlCQUFZLEdBQVksSUFBSSxDQUFDO1FBQzNCLGVBQVUsR0FBWSxLQUFLLENBQUM7UUFFM0MsYUFBUSxHQUFHLElBQUksbUJBQVksRUFBRSxDQUFDO1FBQzlCLGVBQVUsR0FBRyxJQUFJLG1CQUFZLEVBQUUsQ0FBQztJQUVBLENBQUM7SUFFM0MsaUNBQVEsR0FBUjtRQUNFLElBQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLFlBQVksR0FBRyxNQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUNuRSxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksbUJBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxXQUFXLEVBQUUsSUFBSSxDQUFDLE9BQU8sRUFDcEUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQ3hELElBQUksQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLFdBQVcsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDakYsQ0FBQztJQUVELG9DQUFXLEdBQVg7UUFDRSxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3hCLENBQUM7SUFFRCxxQ0FBWSxHQUFaO1FBQ0UsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDekIsQ0FBQztJQUVELG1DQUFVLEdBQVY7UUFDRSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUMzQixDQUFDO0lBR0QscUNBQVksR0FBWixVQUFhLEtBQVU7UUFDckIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMxQixDQUFDO0lBakNEO1FBQUMsWUFBSyxDQUFDLHdCQUF3QixDQUFDOzt5REFBQTtJQUNoQztRQUFDLFlBQUssQ0FBQywwQkFBMEIsQ0FBQzs7dURBQUE7SUFDbEM7UUFBQyxZQUFLLENBQUMsd0JBQXdCLENBQUM7O3FEQUFBO0lBQ2hDO1FBQUMsWUFBSyxDQUFDLGNBQWMsQ0FBQzs7d0RBQUE7SUFDdEI7UUFBQyxZQUFLLENBQUMsZ0JBQWdCLENBQUM7O3NEQUFBO0lBRXhCO1FBQUMsYUFBTSxFQUFFOztvREFBQTtJQUNUO1FBQUMsYUFBTSxFQUFFOztzREFBQTtJQXVCVDtRQUFDLG1CQUFZLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUM7Ozs7c0RBQUE7SUFwQ3JDO1FBQUMsZ0JBQVMsQ0FBQztZQUNULFFBQVEsRUFBRSxtQkFBbUI7U0FDOUIsQ0FBQzs7c0JBQUE7SUFzQ0YscUJBQUM7QUFBRCxDQUFDLEFBckNELElBcUNDO0FBckNZLHNCQUFjLGlCQXFDMUIsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERpcmVjdGl2ZSwgRWxlbWVudFJlZiwgSW5wdXQsIE91dHB1dCwgSG9zdExpc3RlbmVyLCBFdmVudEVtaXR0ZXIsIE9uRGVzdHJveSwgT25Jbml0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBTY3JvbGxlciB9IGZyb20gJy4vc2Nyb2xsZXInO1xuXG5ARGlyZWN0aXZlKHtcbiAgc2VsZWN0b3I6ICdbaW5maW5pdGUtc2Nyb2xsXSdcbn0pXG5leHBvcnQgY2xhc3MgSW5maW5pdGVTY3JvbGwgaW1wbGVtZW50cyBPbkRlc3Ryb3ksIE9uSW5pdCB7XG4gIHB1YmxpYyBzY3JvbGxlcjogU2Nyb2xsZXI7XG5cbiAgQElucHV0KCdpbmZpbml0ZVNjcm9sbERpc3RhbmNlJykgX2Rpc3RhbmNlRG93bjogbnVtYmVyID0gMjtcbiAgQElucHV0KCdpbmZpbml0ZVNjcm9sbFVwRGlzdGFuY2UnKSBfZGlzdGFuY2VVcDogbnVtYmVyID0gMS41O1xuICBASW5wdXQoJ2luZmluaXRlU2Nyb2xsVGhyb3R0bGUnKSBfdGhyb3R0bGU6IG51bWJlciA9IDM7XG4gIEBJbnB1dCgnc2Nyb2xsV2luZG93Jykgc2Nyb2xsV2luZG93OiBib29sZWFuID0gdHJ1ZTtcbiAgQElucHV0KCdpbW1lZGlhdGVDaGVjaycpIF9pbW1lZGlhdGU6IGJvb2xlYW4gPSBmYWxzZTtcblxuICBAT3V0cHV0KCkgc2Nyb2xsZWQgPSBuZXcgRXZlbnRFbWl0dGVyKCk7XG4gIEBPdXRwdXQoKSBzY3JvbGxlZFVwID0gbmV3IEV2ZW50RW1pdHRlcigpO1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgZWxlbWVudDogRWxlbWVudFJlZikge31cblxuICBuZ09uSW5pdCgpIHtcbiAgICBjb25zdCBjb250YWluZXJFbGVtZW50ID0gdGhpcy5zY3JvbGxXaW5kb3cgPyB3aW5kb3cgOiB0aGlzLmVsZW1lbnQ7XG4gICAgdGhpcy5zY3JvbGxlciA9IG5ldyBTY3JvbGxlcihjb250YWluZXJFbGVtZW50LCBzZXRJbnRlcnZhbCwgdGhpcy5lbGVtZW50LFxuICAgICAgICB0aGlzLm9uU2Nyb2xsRG93bi5iaW5kKHRoaXMpLCB0aGlzLm9uU2Nyb2xsVXAuYmluZCh0aGlzKSxcbiAgICAgICAgdGhpcy5fZGlzdGFuY2VEb3duLCB0aGlzLl9kaXN0YW5jZVVwLCB7fSwgdGhpcy5fdGhyb3R0bGUsIHRoaXMuX2ltbWVkaWF0ZSk7XG4gIH1cblxuICBuZ09uRGVzdHJveSAoKSB7XG4gICAgdGhpcy5zY3JvbGxlci5jbGVhbigpO1xuICB9XG5cbiAgb25TY3JvbGxEb3duKCkge1xuICAgIHRoaXMuc2Nyb2xsZWQubmV4dCh7fSk7XG4gIH1cblxuICBvblNjcm9sbFVwKCkge1xuICAgIHRoaXMuc2Nyb2xsZWRVcC5uZXh0KHt9KTtcbiAgfVxuXG4gIEBIb3N0TGlzdGVuZXIoJ3Njcm9sbCcsIFsnJGV2ZW50J10pXG4gIGhhbmRsZVNjcm9sbChldmVudDogYW55KSB7XG4gICAgdGhpcy5zY3JvbGxlci5oYW5kbGVyKCk7XG4gIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5maW5pdGUtc2Nyb2xsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiaW5maW5pdGUtc2Nyb2xsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxxQkFBb0csZUFBZSxDQUFDLENBQUE7QUFDcEgseUJBQXlCLFlBQVksQ0FBQyxDQUFBO0FBS3RDO0lBY0Usd0JBQW9CLE9BQW1CO1FBQW5CLFlBQU8sR0FBUCxPQUFPLENBQVk7UUFYTixrQkFBYSxHQUFXLENBQUMsQ0FBQztRQUN4QixnQkFBVyxHQUFXLEdBQUcsQ0FBQztRQUM1QixjQUFTLEdBQVcsQ0FBQyxDQUFDO1FBQ2hDLGlCQUFZLEdBQVksSUFBSSxDQUFDO1FBQzNCLGVBQVUsR0FBWSxLQUFLLENBQUM7UUFDaEMsZ0JBQVcsR0FBWSxLQUFLLENBQUM7UUFDekIsb0JBQWUsR0FBWSxLQUFLLENBQUM7UUFFaEQsYUFBUSxHQUFHLElBQUksbUJBQVksRUFBRSxDQUFDO1FBQzlCLGVBQVUsR0FBRyxJQUFJLG1CQUFZLEVBQUUsQ0FBQztJQUVBLENBQUM7SUFFM0MsaUNBQVEsR0FBUjtRQUNFLElBQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLFlBQVksR0FBRyxNQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUNuRSxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksbUJBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxXQUFXLEVBQUUsSUFBSSxDQUFDLE9BQU8sRUFDcEUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQ3hELElBQUksQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLFdBQVcsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFDeEQsSUFBSSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQsb0NBQVcsR0FBWDtRQUNFLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDeEIsQ0FBQztJQUVELHFDQUFZLEdBQVosVUFBYSxJQUFTO1FBQVQsb0JBQVMsR0FBVCxTQUFTO1FBQ3BCLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzNCLENBQUM7SUFFRCxtQ0FBVSxHQUFWLFVBQVcsSUFBUztRQUFULG9CQUFTLEdBQVQsU0FBUztRQUNsQixJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM3QixDQUFDO0lBR0QscUNBQVksR0FBWixVQUFhLEtBQVU7UUFDckIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMxQixDQUFDO0lBcENEO1FBQUMsWUFBSyxDQUFDLHdCQUF3QixDQUFDOzt5REFBQTtJQUNoQztRQUFDLFlBQUssQ0FBQywwQkFBMEIsQ0FBQzs7dURBQUE7SUFDbEM7UUFBQyxZQUFLLENBQUMsd0JBQXdCLENBQUM7O3FEQUFBO0lBQ2hDO1FBQUMsWUFBSyxDQUFDLGNBQWMsQ0FBQzs7d0RBQUE7SUFDdEI7UUFBQyxZQUFLLENBQUMsZ0JBQWdCLENBQUM7O3NEQUFBO0lBQ3hCO1FBQUMsWUFBSyxDQUFDLFlBQVksQ0FBQzs7dURBQUE7SUFDcEI7UUFBQyxZQUFLLENBQUMsZ0JBQWdCLENBQUM7OzJEQUFBO0lBRXhCO1FBQUMsYUFBTSxFQUFFOztvREFBQTtJQUNUO1FBQUMsYUFBTSxFQUFFOztzREFBQTtJQXdCVDtRQUFDLG1CQUFZLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUM7Ozs7c0RBQUE7SUF2Q3JDO1FBQUMsZ0JBQVMsQ0FBQztZQUNULFFBQVEsRUFBRSxtQkFBbUI7U0FDOUIsQ0FBQzs7c0JBQUE7SUF5Q0YscUJBQUM7QUFBRCxDQUFDLEFBeENELElBd0NDO0FBeENZLHNCQUFjLGlCQXdDMUIsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERpcmVjdGl2ZSwgRWxlbWVudFJlZiwgSW5wdXQsIE91dHB1dCwgSG9zdExpc3RlbmVyLCBFdmVudEVtaXR0ZXIsIE9uRGVzdHJveSwgT25Jbml0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBTY3JvbGxlciB9IGZyb20gJy4vc2Nyb2xsZXInO1xuXG5ARGlyZWN0aXZlKHtcbiAgc2VsZWN0b3I6ICdbaW5maW5pdGUtc2Nyb2xsXSdcbn0pXG5leHBvcnQgY2xhc3MgSW5maW5pdGVTY3JvbGwgaW1wbGVtZW50cyBPbkRlc3Ryb3ksIE9uSW5pdCB7XG4gIHB1YmxpYyBzY3JvbGxlcjogU2Nyb2xsZXI7XG5cbiAgQElucHV0KCdpbmZpbml0ZVNjcm9sbERpc3RhbmNlJykgX2Rpc3RhbmNlRG93bjogbnVtYmVyID0gMjtcbiAgQElucHV0KCdpbmZpbml0ZVNjcm9sbFVwRGlzdGFuY2UnKSBfZGlzdGFuY2VVcDogbnVtYmVyID0gMS41O1xuICBASW5wdXQoJ2luZmluaXRlU2Nyb2xsVGhyb3R0bGUnKSBfdGhyb3R0bGU6IG51bWJlciA9IDM7XG4gIEBJbnB1dCgnc2Nyb2xsV2luZG93Jykgc2Nyb2xsV2luZG93OiBib29sZWFuID0gdHJ1ZTtcbiAgQElucHV0KCdpbW1lZGlhdGVDaGVjaycpIF9pbW1lZGlhdGU6IGJvb2xlYW4gPSBmYWxzZTtcbiAgQElucHV0KCdob3Jpem9udGFsJykgX2hvcml6b250YWw6IGJvb2xlYW4gPSBmYWxzZTtcbiAgQElucHV0KCdhbHdheXNDYWxsYmFjaycpIF9hbHdheXNDYWxsYmFjazogYm9vbGVhbiA9IGZhbHNlO1xuXG4gIEBPdXRwdXQoKSBzY3JvbGxlZCA9IG5ldyBFdmVudEVtaXR0ZXIoKTtcbiAgQE91dHB1dCgpIHNjcm9sbGVkVXAgPSBuZXcgRXZlbnRFbWl0dGVyKCk7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBlbGVtZW50OiBFbGVtZW50UmVmKSB7fVxuXG4gIG5nT25Jbml0KCkge1xuICAgIGNvbnN0IGNvbnRhaW5lckVsZW1lbnQgPSB0aGlzLnNjcm9sbFdpbmRvdyA/IHdpbmRvdyA6IHRoaXMuZWxlbWVudDtcbiAgICB0aGlzLnNjcm9sbGVyID0gbmV3IFNjcm9sbGVyKGNvbnRhaW5lckVsZW1lbnQsIHNldEludGVydmFsLCB0aGlzLmVsZW1lbnQsXG4gICAgICAgIHRoaXMub25TY3JvbGxEb3duLmJpbmQodGhpcyksIHRoaXMub25TY3JvbGxVcC5iaW5kKHRoaXMpLFxuICAgICAgICB0aGlzLl9kaXN0YW5jZURvd24sIHRoaXMuX2Rpc3RhbmNlVXAsIHt9LCB0aGlzLl90aHJvdHRsZSxcbiAgICAgICAgdGhpcy5faW1tZWRpYXRlLCB0aGlzLl9ob3Jpem9udGFsLCB0aGlzLl9hbHdheXNDYWxsYmFjayk7XG4gIH1cblxuICBuZ09uRGVzdHJveSAoKSB7XG4gICAgdGhpcy5zY3JvbGxlci5jbGVhbigpO1xuICB9XG5cbiAgb25TY3JvbGxEb3duKGRhdGEgPSB7fSkge1xuICAgIHRoaXMuc2Nyb2xsZWQubmV4dChkYXRhKTtcbiAgfVxuXG4gIG9uU2Nyb2xsVXAoZGF0YSA9IHt9KSB7XG4gICAgdGhpcy5zY3JvbGxlZFVwLm5leHQoZGF0YSk7XG4gIH1cblxuICBASG9zdExpc3RlbmVyKCdzY3JvbGwnLCBbJyRldmVudCddKVxuICBoYW5kbGVTY3JvbGwoZXZlbnQ6IGFueSkge1xuICAgIHRoaXMuc2Nyb2xsZXIuaGFuZGxlcigpO1xuICB9XG59XG4iXX0=

src/scroller.js

 "use strict";
 var Rx_1 = require('rxjs/Rx');
+var axis_resolver_1 = require('./axis-resolver');
 var Scroller = (function () {
-    function Scroller(windowElement, $interval, $elementRef, infiniteScrollDownCallback, infiniteScrollUpCallback, infiniteScrollDownDistance, infiniteScrollUpDistance, infiniteScrollParent, infiniteScrollThrottle, isImmediate) {
+    function Scroller(windowElement, $interval, $elementRef, infiniteScrollDownCallback, infiniteScrollUpCallback, infiniteScrollDownDistance, infiniteScrollUpDistance, infiniteScrollParent, infiniteScrollThrottle, isImmediate, horizontal, alwaysCallback) {
+        if (horizontal === void 0) { horizontal = false; }
+        if (alwaysCallback === void 0) { alwaysCallback = false; }
         this.windowElement = windowElement;
@@ -12,2 +15,4 @@ this.$interval = $interval;
         this.isImmediate = isImmediate;
+        this.horizontal = horizontal;
+        this.alwaysCallback = alwaysCallback;
         this.lastScrollPosition = 0;
@@ -23,2 +28,3 @@ this.isContainerWindow = toString.call(this.windowElement).includes('Window');
         this.createInterval();
+        this.axis = new axis_resolver_1.AxisResolver(!this.horizontal);
     }
@@ -42,11 +48,14 @@ Scroller.prototype.defineContainer = function () {
     Scroller.prototype.height = function (elem) {
+        var offsetHeight = this.axis.offsetHeightKey();
+        var clientHeight = this.axis.clientHeightKey();
         // elem = elem.nativeElement;
-        if (isNaN(elem.offsetHeight)) {
-            return this.documentElement.clientHeight;
+        if (isNaN(elem[offsetHeight])) {
+            return this.documentElement[clientHeight];
         }
         else {
-            return elem.offsetHeight;
+            return elem[offsetHeight];
         }
     };
     Scroller.prototype.offsetTop = function (elem) {
+        var top = this.axis.topKey();
         // elem = elem.nativeElement;
@@ -56,14 +65,17 @@ if (!elem.getBoundingClientRect) {
         }
-        return elem.getBoundingClientRect().top + this.pageYOffset(elem);
+        return elem.getBoundingClientRect()[top] + this.pageYOffset(elem);
     };
     Scroller.prototype.pageYOffset = function (elem) {
+        var pageYOffset = this.axis.pageYOffsetKey();
+        var scrollTop = this.axis.scrollTopKey();
+        var offsetTop = this.axis.offsetTopKey();
         // elem = elem.nativeElement;
-        if (isNaN(window.pageYOffset)) {
-            return this.documentElement.scrollTop;
+        if (isNaN(window[pageYOffset])) {
+            return this.documentElement[scrollTop];
         }
         else if (elem.ownerDocument) {
-            return elem.ownerDocument.defaultView.pageYOffset;
+            return elem.ownerDocument.defaultView[pageYOffset];
         }
         else {
-            elem.offsetTop;
+            return elem[offsetTop];
         }
@@ -86,3 +98,3 @@ };
         var shouldScroll = remaining <= containerBreakpoint;
-        var triggerCallback = shouldScroll && this.scrollEnabled;
+        var triggerCallback = (this.alwaysCallback || shouldScroll) && this.scrollEnabled;
         var shouldClearInterval = shouldScroll && this.checkInterval;
@@ -95,6 +107,6 @@ // if (this.useDocumentBottom) {
             if (scrollingDown) {
-                this.infiniteScrollDownCallback();
+                this.infiniteScrollDownCallback({ currentScrollPosition: container.scrolledUntilNow });
             }
             else {
-                this.infiniteScrollUpCallback();
+                this.infiniteScrollUpCallback({ currentScrollPosition: container.scrolledUntilNow });
             }
@@ -121,5 +133,7 @@ }
     Scroller.prototype.calculatePointsForElement = function () {
+        var scrollTop = this.axis.scrollTopKey();
+        var scrollHeight = this.axis.scrollHeightKey();
         var height = this.height(this.container);
         // perhaps use this.container.offsetTop instead of 'scrollTop'
-        var scrolledUntilNow = this.container.scrollTop;
+        var scrolledUntilNow = this.container[scrollTop];
         var containerTopOffset = 0;
@@ -130,3 +144,3 @@ var offsetTop = this.offsetTop(this.container);
         }
-        var totalToScroll = this.container.scrollHeight;
+        var totalToScroll = this.container[scrollHeight];
         // const totalToScroll = this.offsetTop(this.$elementRef.nativeElement) - containerTopOffset + this.height(this.$elementRef.nativeElement);
@@ -165,2 +179,2 @@ return { height: height, scrolledUntilNow: scrolledUntilNow, totalToScroll: totalToScroll };
 exports.Scroller = Scroller;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scroller.js","sourceRoot":"","sources":["scroller.ts"],"names":[],"mappings":"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","sourcesContent":["import { ElementRef } from '@angular/core';\nimport { Observable, Subscription } from 'rxjs/Rx';\n\nexport class Scroller {\n\tpublic scrollDownDistance: number;\n\tpublic scrollUpDistance: number;\n\tpublic scrollEnabled: boolean;\n\tpublic checkWhenEnabled: boolean;\n\tpublic container: Window | ElementRef | any;\n\tpublic immediateCheck: boolean;\n\tpublic useDocumentBottom: boolean;\n\tpublic checkInterval: number;\n\tprivate documentElement: Window | ElementRef | any;\n\tprivate isContainerWindow: boolean;\n\tprivate disposeScroll: Subscription;\n\tpublic lastScrollPosition: number = 0;\n\n\tconstructor(\n\t\tprivate windowElement: Window | ElementRef | any,\n\t\tprivate $interval: Function,\n\t\tprivate $elementRef: ElementRef,\n\t\tprivate infiniteScrollDownCallback: Function,\n\t\tprivate infiniteScrollUpCallback: Function,\n\t\tinfiniteScrollDownDistance: number,\n\t\tinfiniteScrollUpDistance: number,\n\t\tinfiniteScrollParent: Window | ElementRef | any,\n\t\tprivate infiniteScrollThrottle: number,\n\t\tprivate isImmediate: boolean\n\t) {\n\t\tthis.isContainerWindow = toString.call(this.windowElement).includes('Window');\n\t\tthis.documentElement = this.isContainerWindow ? this.windowElement.document.documentElement : null;\n\t\tthis.handleInfiniteScrollDistance(infiniteScrollDownDistance, infiniteScrollUpDistance);\n\n\t\t// if (attrs.infiniteScrollParent != null) {\n\t\t// \tattachEvent(angular.element(elem.parent()));\n\t\t// }\n\t\tthis.handleInfiniteScrollDisabled(false);\n\t\tthis.defineContainer();\n\t\tthis.createInterval();\n\t}\n\n\tdefineContainer () {\n\t\tif (this.isContainerWindow) {\n\t\t\tthis.attachEvent(this.windowElement);\n\t\t} else {\n\t\t\tthis.container = this.windowElement.nativeElement;\n\t\t}\n\t}\n\n\tcreateInterval () {\n\t\tif (this.isImmediate) {\n\t\t\tthis.checkInterval = this.$interval(() => {\n\t\t\t\treturn this.handler();\n\t\t\t}, 0);\n\t\t}\n\t}\n\n\theight (elem: any) {\n\t\t// elem = elem.nativeElement;\n\t\tif (isNaN(elem.offsetHeight)) {\n\t\t\treturn this.documentElement.clientHeight;\n\t\t} else {\n\t\t\treturn elem.offsetHeight;\n\t\t}\n\t}\n\n\toffsetTop (elem: any) {\n\t\t// elem = elem.nativeElement;\n\t\tif (!elem.getBoundingClientRect) { // || elem.css('none')) {\n\t\t\treturn;\n\t\t}\n\t\treturn elem.getBoundingClientRect().top + this.pageYOffset(elem);\n\t}\n\n\tpageYOffset (elem: any) {\n\t\t// elem = elem.nativeElement;\n\t\tif (isNaN(window.pageYOffset)) {\n\t\t\treturn this.documentElement.scrollTop;\n\t\t} else if (elem.ownerDocument) {\n\t\t\treturn elem.ownerDocument.defaultView.pageYOffset;\n\t\t} else {\n\t\t\telem.offsetTop;\n\t\t}\n\t}\n\n\thandler () {\n\t\tconst container = this.calculatePoints();\n\t\tconst scrollingDown: boolean = this.lastScrollPosition < container.scrolledUntilNow;\n\t\tthis.lastScrollPosition = container.scrolledUntilNow;\n\n\t\tlet remaining: number;\n\t\tlet containerBreakpoint: number;\n\t\tif (scrollingDown) {\n\t\t\tremaining = container.totalToScroll - container.scrolledUntilNow;\n\t\t\tcontainerBreakpoint = container.height * this.scrollDownDistance + 1;\n\t\t} else {\n\t\t\tremaining = container.scrolledUntilNow;\n\t\t\tcontainerBreakpoint = container.height * this.scrollUpDistance + 1;\n\t\t}\n\t\tconst shouldScroll: boolean = remaining <= containerBreakpoint;\n\t\tconst triggerCallback: boolean = shouldScroll && this.scrollEnabled;\n\t\tconst shouldClearInterval = shouldScroll && this.checkInterval;\n\t\t// if (this.useDocumentBottom) {\n\t\t// \tcontainer.totalToScroll = this.height(this.$elementRef.nativeElement.ownerDocument);\n\t\t// }\n\t\tthis.checkWhenEnabled = shouldScroll;\n\n\t\tif (triggerCallback) {\n\t\t\tif (scrollingDown) {\n\t\t\t\tthis.infiniteScrollDownCallback();\n\t\t\t} else {\n\t\t\t\tthis.infiniteScrollUpCallback();\n\t\t\t}\n\t\t}\n\t\tif (shouldClearInterval) {\n\t\t\tclearInterval(this.checkInterval);\n\t\t}\n\t}\n\n\tcalculatePoints() {\n\t\treturn this.isContainerWindow\n\t\t\t? this.calculatePointsForWindow()\n\t\t\t: this.calculatePointsForElement();\n\t}\n\n\tcalculatePointsForWindow () {\n\t\t// container's height\n\t\tconst height = this.height(this.container);\n\t\t// scrolled until now / current y point\n\t\tconst scrolledUntilNow = height + this.pageYOffset(this.documentElement);\n\t\t// total height / most bottom y point\n\t\tconst totalToScroll = this.offsetTop(this.$elementRef.nativeElement) + this.height(this.$elementRef.nativeElement);\n\t\treturn { height, scrolledUntilNow, totalToScroll };\n\t}\n\n\tcalculatePointsForElement () {\n\t\tconst height = this.height(this.container);\n\t\t// perhaps use this.container.offsetTop instead of 'scrollTop'\n\t\tconst scrolledUntilNow = this.container.scrollTop;\n\t\tlet containerTopOffset = 0;\n\t\tconst offsetTop = this.offsetTop(this.container);\n\t\tif (offsetTop !== void 0) {\n\t\t\tcontainerTopOffset = offsetTop;\n\t\t}\n\t\tconst totalToScroll = this.container.scrollHeight;\n\t\t// const totalToScroll = this.offsetTop(this.$elementRef.nativeElement) - containerTopOffset + this.height(this.$elementRef.nativeElement);\n\t\treturn { height, scrolledUntilNow, totalToScroll };\n\t}\n\n\thandleInfiniteScrollDistance (scrollDownDistance: number | any, scrollUpDistance: number | any) {\n\t\tthis.scrollDownDistance = parseFloat(scrollDownDistance) || 0;\n\t\tthis.scrollUpDistance = parseFloat(scrollUpDistance) || 0;\n\t}\n\n\tattachEvent (newContainer: Window | ElementRef | any) {\n\t\tthis.clean();\n\t\tthis.container = newContainer;\n\t\tif (newContainer) {\n\t\t\tconst throttle: number = this.infiniteScrollThrottle;\n\t\t\tthis.disposeScroll = Observable.fromEvent(this.container, 'scroll')\n\t\t\t\t.debounce(ev => Observable.timer(throttle))\n\t\t\t\t.subscribe(ev => this.handler())\n\t\t}\n\t}\n\n\tclean () {\n\t\tif (this.disposeScroll) {\n\t\t\tthis.disposeScroll.unsubscribe();\n\t\t}\n\t}\n\n\thandleInfiniteScrollDisabled (enableScroll: boolean) {\n\t\tthis.scrollEnabled = !enableScroll;\n\t\t// if (this.scrollEnabled && checkWhenEnabled) {\n\t\t// \tcheckWhenEnabled = false;\n\t\t// \treturn handler();\n\t\t// }\n\t}\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"scroller.js","sourceRoot":"","sources":["scroller.ts"],"names":[],"mappings":"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","sourcesContent":["import { ElementRef } from '@angular/core';\nimport { Observable, Subscription } from 'rxjs/Rx';\nimport { AxisResolver } from './axis-resolver';\n\nexport class Scroller {\n\tpublic scrollDownDistance: number;\n\tpublic scrollUpDistance: number;\n\tpublic scrollEnabled: boolean;\n\tpublic checkWhenEnabled: boolean;\n\tpublic container: Window | ElementRef | any;\n\tpublic immediateCheck: boolean;\n\tpublic useDocumentBottom: boolean;\n\tpublic checkInterval: number;\n\tprivate documentElement: Window | ElementRef | any;\n\tprivate isContainerWindow: boolean;\n\tprivate disposeScroll: Subscription;\n\tpublic lastScrollPosition: number = 0;\n\tprivate axis: AxisResolver;\n\n\tconstructor(\n\t\tprivate windowElement: Window | ElementRef | any,\n\t\tprivate $interval: Function,\n\t\tprivate $elementRef: ElementRef,\n\t\tprivate infiniteScrollDownCallback: Function,\n\t\tprivate infiniteScrollUpCallback: Function,\n\t\tinfiniteScrollDownDistance: number,\n\t\tinfiniteScrollUpDistance: number,\n\t\tinfiniteScrollParent: Window | ElementRef | any,\n\t\tprivate infiniteScrollThrottle: number,\n\t\tprivate isImmediate: boolean,\n\t\tprivate horizontal: boolean = false,\n\t\tprivate alwaysCallback: boolean = false\n\t) {\n\t\tthis.isContainerWindow = toString.call(this.windowElement).includes('Window');\n\t\tthis.documentElement = this.isContainerWindow ? this.windowElement.document.documentElement : null;\n\t\tthis.handleInfiniteScrollDistance(infiniteScrollDownDistance, infiniteScrollUpDistance);\n\n\t\t// if (attrs.infiniteScrollParent != null) {\n\t\t// \tattachEvent(angular.element(elem.parent()));\n\t\t// }\n\t\tthis.handleInfiniteScrollDisabled(false);\n\t\tthis.defineContainer();\n\t\tthis.createInterval();\n\t\tthis.axis = new AxisResolver(!this.horizontal);\n\t}\n\n\tdefineContainer () {\n\t\tif (this.isContainerWindow) {\n\t\t\tthis.attachEvent(this.windowElement);\n\t\t} else {\n\t\t\tthis.container = this.windowElement.nativeElement;\n\t\t}\n\t}\n\n\tcreateInterval () {\n\t\tif (this.isImmediate) {\n\t\t\tthis.checkInterval = this.$interval(() => {\n\t\t\t\treturn this.handler();\n\t\t\t}, 0);\n\t\t}\n\t}\n\n\theight (elem: any) {\n\t\tlet offsetHeight = this.axis.offsetHeightKey();\n\t\tlet clientHeight = this.axis.clientHeightKey();\n\n\t\t// elem = elem.nativeElement;\n\t\tif (isNaN(elem[offsetHeight])) {\n\t\t\treturn this.documentElement[clientHeight];\n\t\t} else {\n\t\t\treturn elem[offsetHeight];\n\t\t}\n\t}\n\n\toffsetTop (elem: any) {\n\t\tlet top = this.axis.topKey();\n\n\t\t// elem = elem.nativeElement;\n\t\tif (!elem.getBoundingClientRect) { // || elem.css('none')) {\n\t\t\treturn;\n\t\t}\n\t\treturn elem.getBoundingClientRect()[top] + this.pageYOffset(elem);\n\t}\n\n\tpageYOffset (elem: any) {\n\t\tlet pageYOffset = this.axis.pageYOffsetKey();\n\t\tlet scrollTop   = this.axis.scrollTopKey();\n\t\tlet offsetTop   = this.axis.offsetTopKey();\n\n\t\t// elem = elem.nativeElement;\n\t\tif (isNaN(window[pageYOffset])) {\n\t\t\treturn this.documentElement[scrollTop];\n\t\t} else if (elem.ownerDocument) {\n\t\t\treturn elem.ownerDocument.defaultView[pageYOffset];\n\t\t} else {\n\t\t\treturn elem[offsetTop];\n\t\t}\n\t}\n\n\thandler () {\n\t\tconst container = this.calculatePoints();\n\t\tconst scrollingDown: boolean = this.lastScrollPosition < container.scrolledUntilNow;\n\t\tthis.lastScrollPosition = container.scrolledUntilNow;\n\n\t\tlet remaining: number;\n\t\tlet containerBreakpoint: number;\n\t\tif (scrollingDown) {\n\t\t\tremaining = container.totalToScroll - container.scrolledUntilNow;\n\t\t\tcontainerBreakpoint = container.height * this.scrollDownDistance + 1;\n\t\t} else {\n\t\t\tremaining = container.scrolledUntilNow;\n\t\t\tcontainerBreakpoint = container.height * this.scrollUpDistance + 1;\n\t\t}\n\t\tconst shouldScroll: boolean = remaining <= containerBreakpoint;\n\t\tconst triggerCallback: boolean = (this.alwaysCallback || shouldScroll) && this.scrollEnabled;\n\t\tconst shouldClearInterval = shouldScroll && this.checkInterval;\n\t\t// if (this.useDocumentBottom) {\n\t\t// \tcontainer.totalToScroll = this.height(this.$elementRef.nativeElement.ownerDocument);\n\t\t// }\n\t\tthis.checkWhenEnabled = shouldScroll;\n\n\t\tif (triggerCallback) {\n\t\t\tif (scrollingDown) {\n\t\t\t\tthis.infiniteScrollDownCallback({currentScrollPosition: container.scrolledUntilNow});\n\t\t\t} else {\n\t\t\t\tthis.infiniteScrollUpCallback({currentScrollPosition: container.scrolledUntilNow});\n\t\t\t}\n\t\t}\n\t\tif (shouldClearInterval) {\n\t\t\tclearInterval(this.checkInterval);\n\t\t}\n\t}\n\n\tcalculatePoints() {\n\t\treturn this.isContainerWindow\n\t\t\t? this.calculatePointsForWindow()\n\t\t\t: this.calculatePointsForElement();\n\t}\n\n\tcalculatePointsForWindow () {\n\t\t// container's height\n\t\tconst height = this.height(this.container);\n\t\t// scrolled until now / current y point\n\t\tconst scrolledUntilNow = height + this.pageYOffset(this.documentElement);\n\t\t// total height / most bottom y point\n\t\tconst totalToScroll = this.offsetTop(this.$elementRef.nativeElement) + this.height(this.$elementRef.nativeElement);\n\t\treturn { height, scrolledUntilNow, totalToScroll };\n\t}\n\n\tcalculatePointsForElement () {\n\t\tlet scrollTop    = this.axis.scrollTopKey();\n\t\tlet scrollHeight = this.axis.scrollHeightKey();\n\n\t\tconst height = this.height(this.container);\n\t\t// perhaps use this.container.offsetTop instead of 'scrollTop'\n\t\tconst scrolledUntilNow = this.container[scrollTop];\n\t\tlet containerTopOffset = 0;\n\t\tconst offsetTop = this.offsetTop(this.container);\n\t\tif (offsetTop !== void 0) {\n\t\t\tcontainerTopOffset = offsetTop;\n\t\t}\n\t\tconst totalToScroll = this.container[scrollHeight];\n\t\t// const totalToScroll = this.offsetTop(this.$elementRef.nativeElement) - containerTopOffset + this.height(this.$elementRef.nativeElement);\n\t\treturn { height, scrolledUntilNow, totalToScroll };\n\t}\n\n\thandleInfiniteScrollDistance (scrollDownDistance: number | any, scrollUpDistance: number | any) {\n\t\tthis.scrollDownDistance = parseFloat(scrollDownDistance) || 0;\n\t\tthis.scrollUpDistance = parseFloat(scrollUpDistance) || 0;\n\t}\n\n\tattachEvent (newContainer: Window | ElementRef | any) {\n\t\tthis.clean();\n\t\tthis.container = newContainer;\n\t\tif (newContainer) {\n\t\t\tconst throttle: number = this.infiniteScrollThrottle;\n\t\t\tthis.disposeScroll = Observable.fromEvent(this.container, 'scroll')\n\t\t\t\t.debounce(ev => Observable.timer(throttle))\n\t\t\t\t.subscribe(ev => this.handler())\n\t\t}\n\t}\n\n\tclean () {\n\t\tif (this.disposeScroll) {\n\t\t\tthis.disposeScroll.unsubscribe();\n\t\t}\n\t}\n\n\thandleInfiniteScrollDisabled (enableScroll: boolean) {\n\t\tthis.scrollEnabled = !enableScroll;\n\t\t// if (this.scrollEnabled && checkWhenEnabled) {\n\t\t// \tcheckWhenEnabled = false;\n\t\t// \treturn handler();\n\t\t// }\n\t}\n}\n"]}

src/tsconfig.json

@@ -22,4 +22,6 @@ {
     "./infinite-scroll.spec.ts",
-    "./scroller.ts"
+    "./scroller.ts",
+    "./axis-resolver.ts",
+    "./axis-resolver.spec.ts"
     ]
-}
+}

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

306349

increased by4.15%

Lines of code

6440

increased by0.77%

Worsened metrics

Number of package files

24

decreased by-7.69%

No dependency changes