angular2-infinite-scroll
Advanced tools
Comparing version 0.3.2 to 0.3.3
@@ -327,3 +327,3 @@ System.registerDynamic('src/infinite-scroll', ['@angular/core', './position-resolver', './scroll-register', './scroll-resolver'], true, function ($__require, exports, module) { | ||
}); | ||
System.registerDynamic('src/scroll-register', ['@angular/core', 'rxjs/Observable', 'rxjs/add/observable/fromEvent', 'rxjs/add/observable/timer', 'rxjs/add/observable/of', 'rxjs/add/operator/debounce', 'rxjs/add/operator/throttle', 'rxjs/add/operator/filter'], true, function ($__require, exports, module) { | ||
System.registerDynamic('src/scroll-register', ['@angular/core', 'rxjs/Rx', 'rxjs/add/observable/fromEvent', 'rxjs/add/observable/timer', 'rxjs/add/observable/of', 'rxjs/add/operator/debounce', 'rxjs/add/operator/throttle', 'rxjs/add/operator/filter'], true, function ($__require, exports, module) { | ||
"use strict"; | ||
@@ -334,3 +334,3 @@ | ||
var core_1 = $__require('@angular/core'); | ||
var Observable_1 = $__require('rxjs/Observable'); | ||
var Rx_1 = $__require('rxjs/Rx'); | ||
$__require('rxjs/add/observable/fromEvent'); | ||
@@ -345,6 +345,6 @@ $__require('rxjs/add/observable/timer'); | ||
ScrollRegister.prototype.attachEvent = function (options) { | ||
var scroller$ = Observable_1.Observable.fromEvent(options.container, 'scroll')[options.throttleType](function () { | ||
return Observable_1.Observable.timer(options.throttleDuration); | ||
var scroller$ = Rx_1.Observable.fromEvent(options.container, 'scroll')[options.throttleType](function () { | ||
return Rx_1.Observable.timer(options.throttleDuration); | ||
}).filter(options.filterBefore).mergeMap(function (ev) { | ||
return Observable_1.Observable.of(options.mergeMap(ev)); | ||
return Rx_1.Observable.of(options.mergeMap(ev)); | ||
}).subscribe(options.scrollHandler); | ||
@@ -351,0 +351,0 @@ return scroller$; |
@@ -0,1 +1,6 @@ | ||
## v 0.3.3 (2017/03/01) | ||
### Updates | ||
* reverted the fix of #126 | ||
## v 0.3.2 (2017/03/01) | ||
@@ -2,0 +7,0 @@ |
{ | ||
"name": "angular2-infinite-scroll", | ||
"version": "0.3.2", | ||
"version": "0.3.3", | ||
"description": "An infinite scroll directive for angular2", | ||
@@ -5,0 +5,0 @@ "main": "angular2-infinite-scroll.js", |
import { ContainerRef } from './models'; | ||
import { Subscription } from 'rxjs/Subscription'; | ||
import { Subscription } from 'rxjs/Rx'; | ||
import 'rxjs/add/observable/fromEvent'; | ||
@@ -4,0 +4,0 @@ import 'rxjs/add/observable/timer'; |
"use strict"; | ||
var core_1 = require('@angular/core'); | ||
var Observable_1 = require('rxjs/Observable'); | ||
var Rx_1 = require('rxjs/Rx'); | ||
require('rxjs/add/observable/fromEvent'); | ||
@@ -14,5 +14,5 @@ require('rxjs/add/observable/timer'); | ||
ScrollRegister.prototype.attachEvent = function (options) { | ||
var scroller$ = Observable_1.Observable.fromEvent(options.container, 'scroll')[options.throttleType](function () { return Observable_1.Observable.timer(options.throttleDuration); }) | ||
var scroller$ = Rx_1.Observable.fromEvent(options.container, 'scroll')[options.throttleType](function () { return Rx_1.Observable.timer(options.throttleDuration); }) | ||
.filter(options.filterBefore) | ||
.mergeMap(function (ev) { return Observable_1.Observable.of(options.mergeMap(ev)); }) | ||
.mergeMap(function (ev) { return Rx_1.Observable.of(options.mergeMap(ev)); }) | ||
.subscribe(options.scrollHandler); | ||
@@ -29,2 +29,2 @@ return scroller$; | ||
exports.ScrollRegister = ScrollRegister; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Nyb2xsLXJlZ2lzdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic2Nyb2xsLXJlZ2lzdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxxQkFBdUMsZUFBZSxDQUFDLENBQUE7QUFDdkQsMkJBQTJCLGlCQUFpQixDQUFDLENBQUE7QUFFN0MsUUFBTywrQkFBK0IsQ0FBQyxDQUFBO0FBQ3ZDLFFBQU8sMkJBQTJCLENBQUMsQ0FBQTtBQUNuQyxRQUFPLHdCQUF3QixDQUFDLENBQUE7QUFDaEMsUUFBTyw0QkFBNEIsQ0FBQyxDQUFBO0FBQ3BDLFFBQU8sNEJBQTRCLENBQUMsQ0FBQTtBQUNwQyxRQUFPLDBCQUEwQixDQUFDLENBQUE7QUFhbEM7SUFBQTtJQWVBLENBQUM7SUFkQyxvQ0FBVyxHQUFYLFVBQWEsT0FBNkI7UUFDeEMsSUFBTSxTQUFTLEdBQWlCLHVCQUFVLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQzlFLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQyxjQUFNLE9BQUEsdUJBQVUsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGdCQUFnQixDQUFDLEVBQTFDLENBQTBDLENBQUM7YUFDdkUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUM7YUFDNUIsUUFBUSxDQUFDLFVBQUMsRUFBTyxJQUFLLE9BQUEsdUJBQVUsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFuQyxDQUFtQyxDQUFDO2FBQzFELFNBQVMsQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEMsTUFBTSxDQUFDLFNBQVMsQ0FBQztJQUNuQixDQUFDO0lBQ0kseUJBQVUsR0FBMEI7UUFDM0MsRUFBRSxJQUFJLEVBQUUsaUJBQVUsRUFBRTtLQUNuQixDQUFDO0lBQ0Ysa0JBQWtCO0lBQ1gsNkJBQWMsR0FBbUUsY0FBTSxPQUFBLEVBQzdGLEVBRDZGLENBQzdGLENBQUM7SUFDRixxQkFBQztBQUFELENBQUMsQUFmRCxJQWVDO0FBZlksc0JBQWMsaUJBZTFCLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb250YWluZXJSZWYgfSBmcm9tICcuL21vZGVscyc7XG5pbXBvcnQgeyBJbmplY3RhYmxlLCBFbGVtZW50UmVmIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcy9PYnNlcnZhYmxlJztcbmltcG9ydCB7IFN1YnNjcmlwdGlvbiB9IGZyb20gJ3J4anMvU3Vic2NyaXB0aW9uJztcbmltcG9ydCAncnhqcy9hZGQvb2JzZXJ2YWJsZS9mcm9tRXZlbnQnO1xuaW1wb3J0ICdyeGpzL2FkZC9vYnNlcnZhYmxlL3RpbWVyJztcbmltcG9ydCAncnhqcy9hZGQvb2JzZXJ2YWJsZS9vZic7XG5pbXBvcnQgJ3J4anMvYWRkL29wZXJhdG9yL2RlYm91bmNlJztcbmltcG9ydCAncnhqcy9hZGQvb3BlcmF0b3IvdGhyb3R0bGUnO1xuaW1wb3J0ICdyeGpzL2FkZC9vcGVyYXRvci9maWx0ZXInO1xuXG5cbmV4cG9ydCBpbnRlcmZhY2UgU2Nyb2xsUmVnaXN0ZXJDb25maWcge1xuICBjb250YWluZXI6IENvbnRhaW5lclJlZjtcbiAgdGhyb3R0bGVUeXBlOiBzdHJpbmc7XG4gIHRocm90dGxlRHVyYXRpb246IG51bWJlcjtcbiAgZmlsdGVyQmVmb3JlOiBGdW5jdGlvbjtcbiAgbWVyZ2VNYXA6IEZ1bmN0aW9uO1xuICBzY3JvbGxIYW5kbGVyOiBGdW5jdGlvbjtcbn1cblxuXG5leHBvcnQgY2xhc3MgU2Nyb2xsUmVnaXN0ZXIge1xuICBhdHRhY2hFdmVudCAob3B0aW9uczogU2Nyb2xsUmVnaXN0ZXJDb25maWcpOiBTdWJzY3JpcHRpb24ge1xuICAgIGNvbnN0IHNjcm9sbGVyJDogU3Vic2NyaXB0aW9uID0gT2JzZXJ2YWJsZS5mcm9tRXZlbnQob3B0aW9ucy5jb250YWluZXIsICdzY3JvbGwnKVxuICAgICAgW29wdGlvbnMudGhyb3R0bGVUeXBlXSgoKSA9PiBPYnNlcnZhYmxlLnRpbWVyKG9wdGlvbnMudGhyb3R0bGVEdXJhdGlvbikpXG4gICAgICAuZmlsdGVyKG9wdGlvbnMuZmlsdGVyQmVmb3JlKVxuICAgICAgLm1lcmdlTWFwKChldjogYW55KSA9PiBPYnNlcnZhYmxlLm9mKG9wdGlvbnMubWVyZ2VNYXAoZXYpKSlcbiAgICAgIC5zdWJzY3JpYmUob3B0aW9ucy5zY3JvbGxIYW5kbGVyKTtcbiAgICByZXR1cm4gc2Nyb2xsZXIkO1xuICB9XG5zdGF0aWMgZGVjb3JhdG9yczogRGVjb3JhdG9ySW52b2NhdGlvbltdID0gW1xueyB0eXBlOiBJbmplY3RhYmxlIH0sXG5dO1xuLyoqIEBub2NvbGxhcHNlICovXG5zdGF0aWMgY3RvclBhcmFtZXRlcnM6ICgpID0+ICh7dHlwZTogYW55LCBkZWNvcmF0b3JzPzogRGVjb3JhdG9ySW52b2NhdGlvbltdfXxudWxsKVtdID0gKCkgPT4gW1xuXTtcbn1cblxuaW50ZXJmYWNlIERlY29yYXRvckludm9jYXRpb24ge1xuICB0eXBlOiBGdW5jdGlvbjtcbiAgYXJncz86IGFueVtdO1xufVxuIl19 | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Nyb2xsLXJlZ2lzdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic2Nyb2xsLXJlZ2lzdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxxQkFBdUMsZUFBZSxDQUFDLENBQUE7QUFDdkQsbUJBQTJCLFNBQVMsQ0FBQyxDQUFBO0FBRXJDLFFBQU8sK0JBQStCLENBQUMsQ0FBQTtBQUN2QyxRQUFPLDJCQUEyQixDQUFDLENBQUE7QUFDbkMsUUFBTyx3QkFBd0IsQ0FBQyxDQUFBO0FBQ2hDLFFBQU8sNEJBQTRCLENBQUMsQ0FBQTtBQUNwQyxRQUFPLDRCQUE0QixDQUFDLENBQUE7QUFDcEMsUUFBTywwQkFBMEIsQ0FBQyxDQUFBO0FBYWxDO0lBQUE7SUFlQSxDQUFDO0lBZEMsb0NBQVcsR0FBWCxVQUFhLE9BQTZCO1FBQ3hDLElBQU0sU0FBUyxHQUFpQixlQUFVLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQzlFLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQyxjQUFNLE9BQUEsZUFBVSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsRUFBMUMsQ0FBMEMsQ0FBQzthQUN2RSxNQUFNLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQzthQUM1QixRQUFRLENBQUMsVUFBQyxFQUFPLElBQUssT0FBQSxlQUFVLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBbkMsQ0FBbUMsQ0FBQzthQUMxRCxTQUFTLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3BDLE1BQU0sQ0FBQyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUNJLHlCQUFVLEdBQTBCO1FBQzNDLEVBQUUsSUFBSSxFQUFFLGlCQUFVLEVBQUU7S0FDbkIsQ0FBQztJQUNGLGtCQUFrQjtJQUNYLDZCQUFjLEdBQW1FLGNBQU0sT0FBQSxFQUM3RixFQUQ2RixDQUM3RixDQUFDO0lBQ0YscUJBQUM7QUFBRCxDQUFDLEFBZkQsSUFlQztBQWZZLHNCQUFjLGlCQWUxQixDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29udGFpbmVyUmVmIH0gZnJvbSAnLi9tb2RlbHMnO1xuaW1wb3J0IHsgSW5qZWN0YWJsZSwgRWxlbWVudFJlZiB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMvUngnO1xuaW1wb3J0IHsgU3Vic2NyaXB0aW9uIH0gZnJvbSAncnhqcy9SeCc7XG5pbXBvcnQgJ3J4anMvYWRkL29ic2VydmFibGUvZnJvbUV2ZW50JztcbmltcG9ydCAncnhqcy9hZGQvb2JzZXJ2YWJsZS90aW1lcic7XG5pbXBvcnQgJ3J4anMvYWRkL29ic2VydmFibGUvb2YnO1xuaW1wb3J0ICdyeGpzL2FkZC9vcGVyYXRvci9kZWJvdW5jZSc7XG5pbXBvcnQgJ3J4anMvYWRkL29wZXJhdG9yL3Rocm90dGxlJztcbmltcG9ydCAncnhqcy9hZGQvb3BlcmF0b3IvZmlsdGVyJztcblxuXG5leHBvcnQgaW50ZXJmYWNlIFNjcm9sbFJlZ2lzdGVyQ29uZmlnIHtcbiAgY29udGFpbmVyOiBDb250YWluZXJSZWY7XG4gIHRocm90dGxlVHlwZTogc3RyaW5nO1xuICB0aHJvdHRsZUR1cmF0aW9uOiBudW1iZXI7XG4gIGZpbHRlckJlZm9yZTogRnVuY3Rpb247XG4gIG1lcmdlTWFwOiBGdW5jdGlvbjtcbiAgc2Nyb2xsSGFuZGxlcjogRnVuY3Rpb247XG59XG5cblxuZXhwb3J0IGNsYXNzIFNjcm9sbFJlZ2lzdGVyIHtcbiAgYXR0YWNoRXZlbnQgKG9wdGlvbnM6IFNjcm9sbFJlZ2lzdGVyQ29uZmlnKTogU3Vic2NyaXB0aW9uIHtcbiAgICBjb25zdCBzY3JvbGxlciQ6IFN1YnNjcmlwdGlvbiA9IE9ic2VydmFibGUuZnJvbUV2ZW50KG9wdGlvbnMuY29udGFpbmVyLCAnc2Nyb2xsJylcbiAgICAgIFtvcHRpb25zLnRocm90dGxlVHlwZV0oKCkgPT4gT2JzZXJ2YWJsZS50aW1lcihvcHRpb25zLnRocm90dGxlRHVyYXRpb24pKVxuICAgICAgLmZpbHRlcihvcHRpb25zLmZpbHRlckJlZm9yZSlcbiAgICAgIC5tZXJnZU1hcCgoZXY6IGFueSkgPT4gT2JzZXJ2YWJsZS5vZihvcHRpb25zLm1lcmdlTWFwKGV2KSkpXG4gICAgICAuc3Vic2NyaWJlKG9wdGlvbnMuc2Nyb2xsSGFuZGxlcik7XG4gICAgcmV0dXJuIHNjcm9sbGVyJDtcbiAgfVxuc3RhdGljIGRlY29yYXRvcnM6IERlY29yYXRvckludm9jYXRpb25bXSA9IFtcbnsgdHlwZTogSW5qZWN0YWJsZSB9LFxuXTtcbi8qKiBAbm9jb2xsYXBzZSAqL1xuc3RhdGljIGN0b3JQYXJhbWV0ZXJzOiAoKSA9PiAoe3R5cGU6IGFueSwgZGVjb3JhdG9ycz86IERlY29yYXRvckludm9jYXRpb25bXX18bnVsbClbXSA9ICgpID0+IFtcbl07XG59XG5cbmludGVyZmFjZSBEZWNvcmF0b3JJbnZvY2F0aW9uIHtcbiAgdHlwZTogRnVuY3Rpb247XG4gIGFyZ3M/OiBhbnlbXTtcbn1cbiJdfQ== |
163234