Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions e2e/components/button/button.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
describe('button', function () {
describe('disabling behavior', function () {
beforeEach(function() {
browser.get('/button');
});
it('should prevent click handlers from executing when disabled', function () {
element(by.id('testButton')).click();
expect(element(by.id('clickCounter')).getText()).toEqual('1');

element(by.id('disableToggle')).click();
element(by.id('testButton')).click();
expect(element(by.id('clickCounter')).getText()).toEqual('1');
});
});
});


31 changes: 15 additions & 16 deletions src/demo-app/button/button-demo.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
<div class="demo-button">
<section>
Link
<a href="http://www.google.com" md-button color="primary">link</a>
Button
<button md-button>flat</button>
</section>
<section>
Link
<a href="http://www.google.com" md-raised-button color="primary">link</a>
Button
<button md-raised-button>button</button>
</section>

<section>
<button md-button>flat</button>
<button md-raised-button>raised</button>
Expand Down Expand Up @@ -74,10 +61,10 @@

<section>
<div>
<span>isDisabled: {{isDisabled}}</span>
<button md-raised-button (click)="isDisabled=!isDisabled">Disable buttons</button>
<p>isDisabled: {{isDisabled}}, clickCounter: <span id="clickCounter">{{clickCounter}}</span></p>
<button md-raised-button (click)="isDisabled=!isDisabled" id="disableToggle">Disable buttons</button>
</div>
<button md-button [disabled]="isDisabled">off</button>
<button md-button [disabled]="isDisabled" (click)="clickCounter=clickCounter+1" id="testButton">off</button>
<button md-button color="primary" [disabled]="isDisabled">off</button>
<a href="http://www.google.com" md-button color="accent" [disabled]="isDisabled">off</a>
<button md-raised-button color="primary" [disabled]="isDisabled">off</button>
Expand All @@ -89,4 +76,16 @@
<i class="material-icons md-24">favorite</i>
</button>
</section>
<section>
Link
<a href="http://www.google.com" md-button color="primary">link</a>
Button
<button md-button>flat</button>
</section>
<section>
Link
<a href="http://www.google.com" md-raised-button color="primary">link</a>
Button
<button md-raised-button>button</button>
</section>
</div>
4 changes: 4 additions & 0 deletions src/demo-app/button/button-demo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@
background-color: #f7f7f7;
margin: 8px;
}

p {
padding:5px 15px;
}
}

2 changes: 1 addition & 1 deletion src/demo-app/button/button-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ import {MdButton, MdAnchor} from '../../components/button/button';
})
export class ButtonDemo {
isDisabled: boolean = false;

clickCounter: number = 0;
}