From eafd9cebdf4f457ec551547ebef4f4e43eb8390c Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Thu, 2 Mar 2017 18:46:41 +0100 Subject: [PATCH] Rename token to `MD_DISABLE_RIPPLES` --- src/lib/core/ripple/index.ts | 2 +- src/lib/core/ripple/ripple.spec.ts | 4 ++-- src/lib/core/ripple/ripple.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/core/ripple/index.ts b/src/lib/core/ripple/index.ts index 6cbd6360b911..39f098b1b9d1 100644 --- a/src/lib/core/ripple/index.ts +++ b/src/lib/core/ripple/index.ts @@ -4,7 +4,7 @@ import {CompatibilityModule} from '../compatibility/compatibility'; import {VIEWPORT_RULER_PROVIDER} from '../overlay/position/viewport-ruler'; import {SCROLL_DISPATCHER_PROVIDER} from '../overlay/scroll/scroll-dispatcher'; -export {MdRipple, MD_RIPPLES_DISABLE} from './ripple'; +export {MdRipple, MD_DISABLE_RIPPLES} from './ripple'; export {RippleRef} from './ripple-ref'; export {RippleConfig} from './ripple-renderer'; diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts index 09e7b96cfb16..180730c7eeee 100644 --- a/src/lib/core/ripple/ripple.spec.ts +++ b/src/lib/core/ripple/ripple.spec.ts @@ -1,6 +1,6 @@ import {TestBed, ComponentFixture, fakeAsync, tick, inject} from '@angular/core/testing'; import {Component, ViewChild} from '@angular/core'; -import {MdRipple, MdRippleModule, MD_RIPPLES_DISABLE} from './index'; +import {MdRipple, MdRippleModule, MD_DISABLE_RIPPLES} from './index'; import {ViewportRuler} from '../overlay/position/viewport-ruler'; import {RIPPLE_FADE_OUT_DURATION, RIPPLE_FADE_IN_DURATION} from './ripple-renderer'; import {dispatchMouseEvent} from '../testing/dispatch-events'; @@ -282,7 +282,7 @@ describe('MdRipple', () => { TestBed.configureTestingModule({ imports: [MdRippleModule], declarations: [BasicRippleContainer], - providers: [{ provide: MD_RIPPLES_DISABLE, useValue: true }] + providers: [{ provide: MD_DISABLE_RIPPLES, useValue: true }] }); }); diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts index 14e8b1c2d348..844cf20144b7 100644 --- a/src/lib/core/ripple/ripple.ts +++ b/src/lib/core/ripple/ripple.ts @@ -15,7 +15,7 @@ import {ViewportRuler} from '../overlay/position/viewport-ruler'; import {RippleRef} from './ripple-ref'; /** OpaqueToken that can be used to globally disable all ripples. Except programmatic ones. */ -export const MD_RIPPLES_DISABLE = new OpaqueToken('md-ripples-disable'); +export const MD_DISABLE_RIPPLES = new OpaqueToken('md-disable-ripples'); @Directive({ selector: '[md-ripple], [mat-ripple]', @@ -71,7 +71,7 @@ export class MdRipple implements OnChanges, OnDestroy { private _rippleRenderer: RippleRenderer; constructor(elementRef: ElementRef, ngZone: NgZone, ruler: ViewportRuler, - @Optional() @Inject(MD_RIPPLES_DISABLE) private _forceDisableRipples: boolean) { + @Optional() @Inject(MD_DISABLE_RIPPLES) private _forceDisableRipples: boolean) { this._rippleRenderer = new RippleRenderer(elementRef, ngZone, ruler); }