Skip to content

Commit

Permalink
chore: temporarily remove ripples from buttons (#1004)
Browse files Browse the repository at this point in the history
  • Loading branch information
jelbourn authored Aug 11, 2016
1 parent 61027e9 commit c885fa7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
5 changes: 0 additions & 5 deletions src/components/button/button.html
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
<span class="md-button-wrapper"><ng-content></ng-content></span>
<div md-ripple *ngIf="isRippleEnabled()" class="md-button-ripple"
[class.md-button-ripple-round]="isRoundButton()"
[md-ripple-trigger]="getHostElement()"
[md-ripple-color]="isRoundButton() ? 'rgba(255, 255, 255, 0.2)' : ''"
md-ripple-background-color="rgba(0, 0, 0, 0)"></div>
17 changes: 0 additions & 17 deletions src/components/button/button.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,23 +143,6 @@ describe('MdButton', () => {
});

});

// Ripple tests.
describe('button ripples', () => {
it('should remove ripple if md-ripple-disabled input is set', async(() => {
builder.createAsync(TestApp).then(fixture => {
let testComponent = fixture.debugElement.componentInstance;
let buttonDebugElement = fixture.debugElement.query(By.css('button'));

fixture.detectChanges();
expect(buttonDebugElement.nativeElement.querySelectorAll('[md-ripple]').length).toBe(1);

testComponent.rippleDisabled = true;
fixture.detectChanges();
expect(buttonDebugElement.nativeElement.querySelectorAll('[md-ripple]').length).toBe(0);
});
}));
});
});

/** Test component that contains an MdButton. */
Expand Down

0 comments on commit c885fa7

Please sign in to comment.