From bef8f05dacdd6cc08a51c79afacda1df412125fe Mon Sep 17 00:00:00 2001 From: Oren Farhi Date: Wed, 1 Mar 2017 10:41:20 +0200 Subject: [PATCH] reverted #126 (not fixed) --- CHANGELOG.md | 5 +++++ bundles/angular2-infinite-scroll.js | 10 +++++----- src/scroll-register.ts | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0756f46c..49e8a5b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## v 0.3.3 (2017/03/01) + +### Updates +* reverted the fix of #126 + ## v 0.3.2 (2017/03/01) ### Updates diff --git a/bundles/angular2-infinite-scroll.js b/bundles/angular2-infinite-scroll.js index a7162a0d..bd1a06e4 100644 --- a/bundles/angular2-infinite-scroll.js +++ b/bundles/angular2-infinite-scroll.js @@ -324,13 +324,13 @@ System.registerDynamic('src/index', ['@angular/core', './infinite-scroll', './ax }(); exports.InfiniteScrollModule = InfiniteScrollModule; }); -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"; var global = this || self, GLOBAL = global; var core_1 = $__require('@angular/core'); - var Observable_1 = $__require('rxjs/Observable'); + var Rx_1 = $__require('rxjs/Rx'); $__require('rxjs/add/observable/fromEvent'); $__require('rxjs/add/observable/timer'); $__require('rxjs/add/observable/of'); @@ -340,10 +340,10 @@ System.registerDynamic('src/scroll-register', ['@angular/core', 'rxjs/Observable var ScrollRegister = function () { function ScrollRegister() {} 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); return scroller$; }; diff --git a/src/scroll-register.ts b/src/scroll-register.ts index d7db3e95..ca60beda 100644 --- a/src/scroll-register.ts +++ b/src/scroll-register.ts @@ -1,7 +1,7 @@ import { ContainerRef } from './models'; import { Injectable, ElementRef } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { Subscription } from 'rxjs/Subscription'; +import { Observable } from 'rxjs/Rx'; +import { Subscription } from 'rxjs/Rx'; import 'rxjs/add/observable/fromEvent'; import 'rxjs/add/observable/timer'; import 'rxjs/add/observable/of';