Skip to content

Commit

Permalink
Rename token to MD_DISABLE_RIPPLES
Browse files Browse the repository at this point in the history
  • Loading branch information
devversion committed Mar 4, 2017
1 parent 58dacef commit f4df111
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/lib/core/ripple/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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, RippleState} from './ripple-ref';
export {RippleConfig} from './ripple-renderer';

Expand Down
4 changes: 2 additions & 2 deletions src/lib/core/ripple/ripple.spec.ts
Original file line number Diff line number Diff line change
@@ -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, RippleState} from './index';
import {MdRipple, MdRippleModule, MD_DISABLE_RIPPLES, RippleState} 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';
Expand Down Expand Up @@ -356,7 +356,7 @@ describe('MdRipple', () => {
TestBed.configureTestingModule({
imports: [MdRippleModule],
declarations: [BasicRippleContainer],
providers: [{ provide: MD_RIPPLES_DISABLE, useValue: true }]
providers: [{ provide: MD_DISABLE_RIPPLES, useValue: true }]
});
});

Expand Down
4 changes: 2 additions & 2 deletions src/lib/core/ripple/ripple.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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]',
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit f4df111

Please sign in to comment.