Skip to content

Commit f14b318

Browse files
committed
fixup! feat(material/slider): improve slider demo
1 parent 68424d8 commit f14b318

File tree

3 files changed

+29
-35
lines changed

3 files changed

+29
-35
lines changed

src/dev-app/slider/slider-demo.html

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
<mat-checkbox [color]="colorModel" [(ngModel)]="discrete">Discrete</mat-checkbox>
2-
<br>
3-
<mat-checkbox [color]="colorModel" [(ngModel)]="showTickMarks">Show tick marks</mat-checkbox>
4-
<br>
5-
<mat-button-toggle-group [(ngModel)]="colorModel" aria-label="Slider color options">
6-
<mat-button-toggle value="primary">Primary</mat-button-toggle>
7-
<mat-button-toggle value="accent">Accent</mat-button-toggle>
8-
<mat-button-toggle value="warn">Warn</mat-button-toggle>
9-
</mat-button-toggle-group>
10-
<br>
11-
<br>
12-
<br>
1+
<div class="demo-global-controls-container">
2+
<mat-checkbox [color]="colorModel" [(ngModel)]="discrete">Discrete</mat-checkbox>
3+
<br>
4+
<mat-checkbox [color]="colorModel" [(ngModel)]="showTickMarks">Show tick marks</mat-checkbox>
5+
<br>
6+
<mat-button-toggle-group [(ngModel)]="colorModel" aria-label="Slider color options">
7+
<mat-button-toggle value="primary">Primary</mat-button-toggle>
8+
<mat-button-toggle value="accent">Accent</mat-button-toggle>
9+
<mat-button-toggle value="warn">Warn</mat-button-toggle>
10+
</mat-button-toggle-group>
11+
</div>
1312

1413
<mat-tab-group [color]="colorModel">
1514
<mat-tab label="Reactive form controls">
@@ -38,11 +37,9 @@
3837
</table>
3938

4039
<input class="demo-native-slider" type="range" [formControl]="control" #nativeSlider1 />
41-
<br>
4240
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
4341
<input matSliderThumb [formControl]="control" #ngThumb1 />
4442
</mat-slider>
45-
<br>
4643
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
4744
<input matSliderStartThumb [formControl]="control" #ngStartThumb1 />
4845
<input matSliderEndThumb #ngEndThumb1 />
@@ -95,14 +92,10 @@
9592
</tr>
9693
</table>
9794

98-
<br>
99-
10095
<input class="demo-native-slider" type="range" #nativeSlider2 [(ngModel)]="valueModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel" />
101-
<br>
10296
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
10397
<input matSliderThumb #ngThumb2 [(ngModel)]="valueModel" />
10498
</mat-slider>
105-
<br>
10699
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
107100
<input matSliderStartThumb #ngStartThumb2 [(ngModel)]="valueModel" />
108101
<input matSliderEndThumb #ngEndThumb2 />
@@ -156,11 +149,9 @@
156149
</table>
157150

158151
<input class="demo-native-slider" type="range" #nativeSlider3 [value]="value" [min]="min" [max]="max" [step]="step" [disabled]="disabled" />
159-
<br>
160152
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
161153
<input matSliderThumb #ngThumb3 [value]="value" />
162154
</mat-slider>
163-
<br>
164155
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
165156
<input matSliderStartThumb #ngStartThumb3 [value]="value" />
166157
<input matSliderEndThumb #ngEndThumb3 />
@@ -186,7 +177,6 @@
186177
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
187178
<input matSliderThumb #ngThumb4 [(value)]="twoWayValue" />
188179
</mat-slider>
189-
<br>
190180
<mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
191181
<input matSliderStartThumb #ngStartThumb4 [(value)]="twoWayValue" />
192182
<input matSliderEndThumb #ngEndThumb4 />

src/dev-app/slider/slider-demo.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.demo-global-controls-container {
2+
padding-bottom: 30px;
3+
}
4+
15
.demo-data-table {
26
font-family: arial, sans-serif;
37
border-collapse: collapse;

src/dev-app/slider/slider-demo.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@ import {MatCheckboxModule} from '@angular/material/checkbox';
2828
styleUrls: ['slider-demo.css'],
2929
})
3030
export class SliderDemo {
31-
discrete: boolean = true;
32-
showTickMarks: boolean = true;
33-
colorModel: string = 'primary';
31+
discrete = true;
32+
showTickMarks = true;
33+
colorModel = 'primary';
3434

3535
noop = () => {};
36-
min: string = '0';
37-
max: string = '100';
38-
step: string = '0';
39-
value: string = '0';
40-
disabled: boolean = false;
36+
min = '0';
37+
max = '100';
38+
step = '0';
39+
value = '0';
40+
disabled = false;
4141

42-
twoWayValue: number = 0;
42+
twoWayValue = 0;
4343

44-
minModel: number = 0;
45-
maxModel: number = 100;
46-
valueModel: number = 0;
47-
stepModel: number = 0;
48-
disabledModel: boolean = false;
44+
minModel = 0;
45+
maxModel = 100;
46+
valueModel = 0;
47+
stepModel = 0;
48+
disabledModel = false;
4949

5050
control = new FormControl('0');
5151

0 commit comments

Comments
 (0)