Skip to content

update(slide-toggle): remove CRLF line endings #1712

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

Merged
merged 1 commit into from
Nov 19, 2016
Merged

update(slide-toggle): remove CRLF line endings #1712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 28 additions & 28 deletions src/demo-app/slide-toggle/slide-toggle-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<div>
<md-slide-toggle color="primary" [(ngModel)]="firstToggle">
Default Slide Toggle
</md-slide-toggle>
<md-slide-toggle [(ngModel)]="firstToggle" disabled>
Disabled Slide Toggle
</md-slide-toggle>
<md-slide-toggle [disabled]="firstToggle">
Disable Bound
</md-slide-toggle>
<p>Example where the slide toggle is required inside of a form.</p>
<form #form="ngForm" (ngSubmit)="onFormSubmit()">
<md-slide-toggle name="slideToggle" required ngModel>
Slide Toggle
</md-slide-toggle>
<p>
<button md-raised-button type="submit">Submit Form</button>
</p>
</form>
<div>

<md-slide-toggle color="primary" [(ngModel)]="firstToggle">
Default Slide Toggle
</md-slide-toggle>

<md-slide-toggle [(ngModel)]="firstToggle" disabled>
Disabled Slide Toggle
</md-slide-toggle>

<md-slide-toggle [disabled]="firstToggle">
Disable Bound
</md-slide-toggle>

<p>Example where the slide toggle is required inside of a form.</p>

<form #form="ngForm" (ngSubmit)="onFormSubmit()">

<md-slide-toggle name="slideToggle" required ngModel>
Slide Toggle
</md-slide-toggle>

<p>
<button md-raised-button type="submit">Submit Form</button>
</p>

</form>

</div>
34 changes: 17 additions & 17 deletions src/demo-app/slide-toggle/slide-toggle-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import {Component} from '@angular/core';
@Component({
moduleId: module.id,
selector: 'switch-demo',
templateUrl: 'slide-toggle-demo.html',
styleUrls: ['slide-toggle-demo.css'],
})
export class SlideToggleDemo {
firstToggle: boolean;
onFormSubmit() {
alert(`You submitted the form.`);
}
}
import {Component} from '@angular/core';


@Component({
moduleId: module.id,
selector: 'switch-demo',
templateUrl: 'slide-toggle-demo.html',
styleUrls: ['slide-toggle-demo.css'],
})
export class SlideToggleDemo {
firstToggle: boolean;

onFormSubmit() {
alert(`You submitted the form.`);
}

}
66 changes: 33 additions & 33 deletions src/lib/slide-toggle/slide-toggle.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
<label class="md-slide-toggle-label">
<div class="md-slide-toggle-container">
<div class="md-slide-toggle-bar"></div>
<div class="md-slide-toggle-thumb-container"
(slidestart)="_onDragStart()"
(slide)="_onDrag($event)"
(slideend)="_onDragEnd()">
<div class="md-slide-toggle-thumb">
<div class="md-ink-ripple"></div>
</div>
</div>
<input #input class="md-slide-toggle-input md-visually-hidden" type="checkbox"
[id]="getInputId()"
[required]="required"
[tabIndex]="tabIndex"
[checked]="checked"
[disabled]="disabled"
[attr.name]="name"
[attr.aria-label]="ariaLabel"
[attr.aria-labelledby]="ariaLabelledby"
(blur)="_onInputBlur()"
(focus)="_onInputFocus()"
(change)="_onChangeEvent($event)"
(click)="_onInputClick($event)">
</div>
<span class="md-slide-toggle-content">
<ng-content></ng-content>
</span>
</label>
<label class="md-slide-toggle-label">

<div class="md-slide-toggle-container">
<div class="md-slide-toggle-bar"></div>

<div class="md-slide-toggle-thumb-container"
(slidestart)="_onDragStart()"
(slide)="_onDrag($event)"
(slideend)="_onDragEnd()">

<div class="md-slide-toggle-thumb">
<div class="md-ink-ripple"></div>
</div>
</div>

<input #input class="md-slide-toggle-input md-visually-hidden" type="checkbox"
[id]="getInputId()"
[required]="required"
[tabIndex]="tabIndex"
[checked]="checked"
[disabled]="disabled"
[attr.name]="name"
[attr.aria-label]="ariaLabel"
[attr.aria-labelledby]="ariaLabelledby"
(blur)="_onInputBlur()"
(focus)="_onInputFocus()"
(change)="_onChangeEvent($event)"
(click)="_onInputClick($event)">
</div>
<span class="md-slide-toggle-content">
<ng-content></ng-content>
</span>
</label>
Loading