reverted orizens#126 (not fixed)

torsten-simon · Mar 1, 2017 · bef8f05 · bef8f05
1 parent 668569c
commit bef8f05
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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';