From 2f031ce444d46b7f869831efabace3908e6232ab Mon Sep 17 00:00:00 2001 From: Trotyl Yu Date: Thu, 7 Sep 2017 15:24:31 +0800 Subject: [PATCH] refactor(module:core,tabs): not use re-exported operator from cdk (#241) --- src/components/core/overlay/scroll/scroll-dispatcher.ts | 2 +- src/components/tabs/nz-tabs-nav.component.ts | 3 ++- src/components/tabs/nz-tabset.component.ts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/core/overlay/scroll/scroll-dispatcher.ts b/src/components/core/overlay/scroll/scroll-dispatcher.ts index 133913266e..67bd96936a 100755 --- a/src/components/core/overlay/scroll/scroll-dispatcher.ts +++ b/src/components/core/overlay/scroll/scroll-dispatcher.ts @@ -13,7 +13,7 @@ import {Subject} from 'rxjs/Subject'; import {Subscription} from 'rxjs/Subscription'; import {fromEvent} from 'rxjs/observable/fromEvent'; import {merge} from 'rxjs/observable/merge'; -import {auditTime} from '@angular/cdk'; +import {auditTime} from 'rxjs/operator/auditTime'; /** Time in ms to throttle the scrolling events by default. */ diff --git a/src/components/tabs/nz-tabs-nav.component.ts b/src/components/tabs/nz-tabs-nav.component.ts index 8b12dbd2ac..9e72061639 100644 --- a/src/components/tabs/nz-tabs-nav.component.ts +++ b/src/components/tabs/nz-tabs-nav.component.ts @@ -23,10 +23,11 @@ import { NzTabLabelDirective } from './nz-tab-label.directive'; const EXAGGERATED_OVERSCROLL = 64; export type ScrollDirection = 'after' | 'before'; -import { auditTime, startWith } from '@angular/cdk'; import { of as observableOf } from 'rxjs/observable/of'; import { merge } from 'rxjs/observable/merge'; import { fromEvent } from 'rxjs/observable/fromEvent'; +import { auditTime } from 'rxjs/operator/auditTime'; +import { startWith } from 'rxjs/operator/startWith'; /** duplicated defined https://github.com/angular/angular-cli/issues/2034 **/ export type NzTabPositionMode = 'horizontal' | 'vertical'; diff --git a/src/components/tabs/nz-tabset.component.ts b/src/components/tabs/nz-tabset.component.ts index 93f846ba95..37186fbac4 100644 --- a/src/components/tabs/nz-tabset.component.ts +++ b/src/components/tabs/nz-tabset.component.ts @@ -17,8 +17,8 @@ import { } from '@angular/core'; import { NzTabComponent } from './nz-tab.component'; import { NzTabsNavComponent } from './nz-tabs-nav.component'; -import { map } from '@angular/cdk'; import { Observable } from 'rxjs/Observable'; +import { map } from 'rxjs/operator/map'; export interface NzAnimatedInterface { inkBar: boolean,