Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(tab): use MD_RIPPLE_GLOBAL_OPTIONS in tab #3553

Merged
merged 2 commits into from
Mar 10, 2017
Merged

fix(tab): use MD_RIPPLE_GLOBAL_OPTIONS in tab #3553

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16af964
use MD_RIIPLE_GLOBAL_OPTIONS in tab
tinayuangao Mar 10, 2017
21bbeba
.
tinayuangao Mar 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was just about to submit a PR for this :D. I think the parameter here has to be renamed as well.

Copy link
Member

@devversion devversion Mar 10, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we rename that to globalOptions as well?

Also sorry couldn't do anything about it, the PR from Andrew was merged before and I had no chance to rebase on top of it again :P

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated. Please take another look. Thanks

super(elementRef, ngZone, ruler, forceDisableRipples);
}
}