From 16af96477eb6ddb03870e390ef0d11ffb920f1cd Mon Sep 17 00:00:00 2001 From: Yuan Gao Date: Fri, 10 Mar 2017 11:00:32 -0800 Subject: [PATCH 1/2] use MD_RIIPLE_GLOBAL_OPTIONS in tab --- src/lib/tabs/tab-nav-bar/tab-nav-bar.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts index e960f42b6ec7..db00adff59d1 100644 --- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts +++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts @@ -9,7 +9,7 @@ import { import {MdInkBar} from '../ink-bar'; import {MdRipple} from '../../core/ripple/index'; import {ViewportRuler} from '../../core/overlay/position/viewport-ruler'; -import {MD_DISABLE_RIPPLES} from '../../core/ripple/ripple'; +import {MD_RIPPLE_GLOBAL_OPTIONS} from '../../core/ripple/ripple'; /** * Navigation component matching the styles of the tab group header. @@ -83,7 +83,7 @@ export class MdTabLink { }) export class MdTabLinkRipple extends MdRipple { constructor(elementRef: ElementRef, ngZone: NgZone, ruler: ViewportRuler, - @Optional() @Inject(MD_DISABLE_RIPPLES) forceDisableRipples: boolean) { + @Optional() @Inject(MD_RIPPLE_GLOBAL_OPTIONS) forceDisableRipples: boolean) { super(elementRef, ngZone, ruler, forceDisableRipples); } } From 21bbeba17be41e062b3b1fb35d04ebdb2c35d670 Mon Sep 17 00:00:00 2001 From: Yuan Gao Date: Fri, 10 Mar 2017 11:12:45 -0800 Subject: [PATCH 2/2] . --- src/lib/tabs/tab-nav-bar/tab-nav-bar.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts index db00adff59d1..0698eeed1fdd 100644 --- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts +++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts @@ -9,7 +9,7 @@ import { import {MdInkBar} from '../ink-bar'; import {MdRipple} from '../../core/ripple/index'; import {ViewportRuler} from '../../core/overlay/position/viewport-ruler'; -import {MD_RIPPLE_GLOBAL_OPTIONS} from '../../core/ripple/ripple'; +import {MD_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '../../core/ripple/ripple'; /** * Navigation component matching the styles of the tab group header. @@ -83,7 +83,7 @@ export class MdTabLink { }) export class MdTabLinkRipple extends MdRipple { constructor(elementRef: ElementRef, ngZone: NgZone, ruler: ViewportRuler, - @Optional() @Inject(MD_RIPPLE_GLOBAL_OPTIONS) forceDisableRipples: boolean) { - super(elementRef, ngZone, ruler, forceDisableRipples); + @Optional() @Inject(MD_RIPPLE_GLOBAL_OPTIONS) globalOptions: RippleGlobalOptions) { + super(elementRef, ngZone, ruler, globalOptions); } }