Skip to content

Commit dc21607

Browse files
jelbournhansl
authored andcommittedSep 26, 2016
chore(button): re-add ripples (#1332)
1 parent 23143b9 commit dc21607

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed
 

‎src/lib/button/button.html

+5
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
<span class="md-button-wrapper"><ng-content></ng-content></span>
2+
<div md-ripple *ngIf="isRippleEnabled()" class="md-button-ripple"
3+
[class.md-button-ripple-round]="isRoundButton()"
4+
[md-ripple-trigger]="getHostElement()"
5+
[md-ripple-color]="isRoundButton() ? 'rgba(255, 255, 255, 0.2)' : ''"
6+
md-ripple-background-color="rgba(0, 0, 0, 0)"></div>

‎src/lib/button/button.spec.ts

+15
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,22 @@ describe('MdButton', () => {
120120
fixture.detectChanges();
121121
expect(buttonDebugElement.nativeElement.getAttribute('aria-disabled')).toBe('true');
122122
});
123+
});
124+
125+
// Ripple tests.
126+
describe('button ripples', () => {
127+
it('should remove ripple if md-ripple-disabled input is set', () => {
128+
let fixture = TestBed.createComponent(TestApp);
129+
let testComponent = fixture.debugElement.componentInstance;
130+
let buttonDebugElement = fixture.debugElement.query(By.css('button'));
123131

132+
fixture.detectChanges();
133+
expect(buttonDebugElement.nativeElement.querySelectorAll('[md-ripple]').length).toBe(1);
134+
135+
testComponent.rippleDisabled = true;
136+
fixture.detectChanges();
137+
expect(buttonDebugElement.nativeElement.querySelectorAll('[md-ripple]').length).toBe(0);
138+
});
124139
});
125140
});
126141

0 commit comments

Comments
 (0)
Please sign in to comment.