Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit 5840197

Browse files
authored
chore: update examples to match material2 repo (#152)
1 parent f9838b6 commit 5840197

32 files changed

+135
-33
lines changed

src/app/examples/autocomplete-overview/autocomplete-overview-example.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import {Component} from '@angular/core';
22
import {FormControl} from '@angular/forms';
3+
34
import 'rxjs/add/operator/startWith';
5+
import 'rxjs/add/operator/map';
46

57
@Component({
68
selector: 'autocomplete-overview-example',
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<h1 md-dialog-title>Dialog with elements</h1>
2+
<div md-dialog-content>This dialog showcases the title, close, content and actions elements.</div>
3+
<div md-dialog-actions>
4+
<button md-button md-dialog-close>Close</button>
5+
</div>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/** No CSS for this example */
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<button md-button (click)="openDialog()">Launch dialog</button>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import {Component} from '@angular/core';
2+
import {MdDialog} from '@angular/material';
3+
4+
5+
@Component({
6+
selector: 'dialog-elements-example',
7+
templateUrl: './dialog-elements-example.html',
8+
})
9+
export class DialogElementsExample {
10+
constructor(public dialog: MdDialog) { }
11+
12+
openDialog() {
13+
this.dialog.open(DialogElementsExampleDialog);
14+
}
15+
}
16+
17+
18+
@Component({
19+
selector: 'dialog-elements-example-dialog',
20+
templateUrl: './dialog-elements-example-dialog.html',
21+
})
22+
export class DialogElementsExampleDialog { }

src/app/examples/example-data.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ export class ExampleData {
2828
}
2929
this.selectorName = this.indexFilename = `${example}-example`;
3030

31-
var exampleName = example.replace(/(?:^\w|\b\w)/g, function(letter) {
32-
return letter.toUpperCase();
33-
});
31+
let exampleName = example.replace(/(?:^\w|\b\w)/g, letter => letter.toUpperCase());
3432

3533
if (EXAMPLE_COMPONENTS[example].title) {
3634
this.description = EXAMPLE_COMPONENTS[example].title;

src/app/examples/example-module.ts

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {NgModule} from '@angular/core';
22
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
33
import {CommonModule} from '@angular/common';
44
import {MaterialModule} from '@angular/material';
5+
import {AutocompleteOverviewExample} from './autocomplete-overview/autocomplete-overview-example';
56
import {ButtonOverviewExample} from './button-overview/button-overview-example';
67
import {ButtonTypesExample} from './button-types/button-types-example';
78
import {CheckboxOverviewExample} from './checkbox-overview/checkbox-overview-example';
@@ -39,6 +40,10 @@ import {
3940
DialogResultExampleDialog,
4041
DialogResultExample
4142
} from './dialog-result/dialog-result-example';
43+
import {
44+
DialogElementsExampleDialog,
45+
DialogElementsExample
46+
} from './dialog-elements/dialog-elements-example';
4247
import {TooltipOverviewExample} from './tooltip-overview/tooltip-overview-example';
4348
import {ButtonToggleOverviewExample} from './button-toggle-overview/button-toggle-overview-example';
4449
import {GridListOverviewExample} from './grid-list-overview/grid-list-overview-example';
@@ -62,7 +67,6 @@ import {TabsTemplateLabelExample} from './tabs-template-label/tabs-template-labe
6267
import {RadioOverviewExample} from './radio-overview/radio-overview-example';
6368
import {SidenavOverviewExample} from './sidenav-overview/sidenav-overview-example';
6469
import {SelectOverviewExample} from './select-overview/select-overview-example';
65-
import {AutocompleteOverviewExample} from './autocomplete-overview/autocomplete-overview-example';
6670
import {ChipsOverviewExample} from './chips-overview/chips-overview-example';
6771
import {ChipsStackedExample} from './chips-stacked/chips-stacked-example';
6872
import {SelectFormExample} from './select-form/select-form-example';
@@ -102,11 +106,17 @@ export const EXAMPLE_COMPONENTS = {
102106
selectorName: 'DialogOverviewExample, DialogOverviewExampleDialog',
103107
},
104108
'dialog-result': {
105-
title: 'Dailog with a result',
109+
title: 'Dialog with a result',
106110
component: DialogResultExample,
107111
additionalFiles: ['dialog-result-example-dialog.html'],
108112
selectorName: 'DialogResultExample, DialogResultExampleDialog',
109113
},
114+
'dialog-elements': {
115+
title: 'Dialog elements',
116+
component: DialogElementsExample,
117+
additionalFiles: ['dialog-elements-example-dialog.html'],
118+
selectorName: 'DialogElementsExample, DialogElementsExampleDialog',
119+
},
110120
'grid-list-dynamic': {title: 'Dynamic grid-list', component: GridListDynamicExample},
111121
'grid-list-overview': {title: 'Basic grid-list', component: GridListOverviewExample},
112122
'icon-overview': {title: 'Basic icons', component: IconOverviewExample},
@@ -145,10 +155,7 @@ export const EXAMPLE_COMPONENTS = {
145155
'slide-toggle-overview': {title: 'Basic slide-toggles', component: SlideToggleOverviewExample},
146156
'snack-bar-component': {
147157
title: 'Snack-bar with a custom component',
148-
component: SnackBarComponentExample,
149-
selectorName: 'SnackBarComponentExample, PizzaPartyComponent',
150-
additionalFiles:
151-
['snack-bar-component-example-snack.html', 'snack-bar-component-example-snack.css']
158+
component: SnackBarComponentExample
152159
},
153160
'snack-bar-overview': {title: 'Basic snack-bar', component: SnackBarOverviewExample},
154161
'tabs-overview': {title: 'Basic tabs', component: TabsOverviewExample},
@@ -179,6 +186,8 @@ export const EXAMPLE_LIST = [
179186
DialogOverviewExampleDialog,
180187
DialogResultExample,
181188
DialogResultExampleDialog,
189+
DialogElementsExample,
190+
DialogElementsExampleDialog,
182191
GridListDynamicExample,
183192
GridListOverviewExample,
184193
IconOverviewExample,
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
/** No CSS for this example */
1+
md-grid-tile {
2+
background: lightblue;
3+
}

src/app/examples/grid-list-overview/grid-list-overview-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<md-grid-list cols="2">
1+
<md-grid-list cols="2" rowHeight="2:1">
22
<md-grid-tile>1</md-grid-tile>
33
<md-grid-tile>2</md-grid-tile>
44
<md-grid-tile>3</md-grid-tile>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {Component} from '@angular/core';
22

3-
43
@Component({
54
selector: 'grid-list-overview-example',
5+
styleUrls: ['./grid-list-overview-example.css'],
66
templateUrl: './grid-list-overview-example.html',
77
})
88
export class GridListOverviewExample {}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
.mat-list-icon {
22
color: rgba(0,0,0,0.54);
3-
}
4-
3+
}

src/app/examples/progress-spinner-configurable/progress-spinner-configurable-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<md-card>
22
<md-card-content>
3-
<h2 class="example-h2">Progress circle configuration</h2>
3+
<h2 class="example-h2">Progress spinner configuration</h2>
44

55
<section class="example-section">
66
<label class="example-margin">Color:</label>
@@ -41,7 +41,7 @@ <h2 class="example-h2">Result</h2>
4141

4242
<md-progress-spinner
4343
class="example-margin"
44-
[color]="color"
44+
[attr.color]="color"
4545
[mode]="mode"
4646
[value]="value">
4747
</md-progress-spinner>

src/app/examples/progress-spinner-configurable/progress-spinner-configurable-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {Component} from '@angular/core';
77
styleUrls: ['./progress-spinner-configurable-example.css'],
88
})
99
export class ProgressSpinnerConfigurableExample {
10-
color = 'praimry';
10+
color = 'primary';
1111
mode = 'determinate';
1212
value = 50;
1313
}

src/assets/plunker/examples/autocomplete-overview/autocomplete-overview-example.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import {Component} from '@angular/core';
22
import {FormControl} from '@angular/forms';
3+
34
import 'rxjs/add/operator/startWith';
5+
import 'rxjs/add/operator/map';
46

57
@Component({
68
selector: 'autocomplete-overview-example',

src/assets/plunker/examples/card-fancy/card-fancy-example.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
}
44

55
.example-header-image {
6-
background-image: url('assets/img/examples/shiba1.jpg');
6+
background-image: url('../../../assets/img/examples/shiba1.jpg');
77
background-size: cover;
88
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<h1 md-dialog-title>Dialog with elements</h1>
2+
<div md-dialog-content>This dialog showcases the title, close, content and actions elements.</div>
3+
<div md-dialog-actions>
4+
<button md-button md-dialog-close>Close</button>
5+
</div>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/** No CSS for this example */
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<button md-button (click)="openDialog()">Launch dialog</button>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import {Component} from '@angular/core';
2+
import {MdDialog} from '@angular/material';
3+
4+
5+
@Component({
6+
selector: 'dialog-elements-example',
7+
templateUrl: './dialog-elements-example.html',
8+
})
9+
export class DialogElementsExample {
10+
constructor(public dialog: MdDialog) { }
11+
12+
openDialog() {
13+
this.dialog.open(DialogElementsExampleDialog);
14+
}
15+
}
16+
17+
18+
@Component({
19+
selector: 'dialog-elements-example-dialog',
20+
templateUrl: './dialog-elements-example-dialog.html',
21+
})
22+
export class DialogElementsExampleDialog { }

src/assets/plunker/examples/example-data.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ export class ExampleData {
2828
}
2929
this.selectorName = this.indexFilename = `${example}-example`;
3030

31-
var exampleName = example.replace(/(?:^\w|\b\w)/g, function(letter) {
32-
return letter.toUpperCase();
33-
});
31+
let exampleName = example.replace(/(?:^\w|\b\w)/g, letter => letter.toUpperCase());
3432

3533
if (EXAMPLE_COMPONENTS[example].title) {
3634
this.description = EXAMPLE_COMPONENTS[example].title;

src/assets/plunker/examples/example-module.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {NgModule} from '@angular/core';
22
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
33
import {CommonModule} from '@angular/common';
44
import {MaterialModule} from '@angular/material';
5+
import {AutocompleteOverviewExample} from './autocomplete-overview/autocomplete-overview-example';
56
import {ButtonOverviewExample} from './button-overview/button-overview-example';
67
import {ButtonTypesExample} from './button-types/button-types-example';
78
import {CheckboxOverviewExample} from './checkbox-overview/checkbox-overview-example';
@@ -39,6 +40,10 @@ import {
3940
DialogResultExampleDialog,
4041
DialogResultExample
4142
} from './dialog-result/dialog-result-example';
43+
import {
44+
DialogElementsExampleDialog,
45+
DialogElementsExample
46+
} from './dialog-elements/dialog-elements-example';
4247
import {TooltipOverviewExample} from './tooltip-overview/tooltip-overview-example';
4348
import {ButtonToggleOverviewExample} from './button-toggle-overview/button-toggle-overview-example';
4449
import {GridListOverviewExample} from './grid-list-overview/grid-list-overview-example';
@@ -62,7 +67,6 @@ import {TabsTemplateLabelExample} from './tabs-template-label/tabs-template-labe
6267
import {RadioOverviewExample} from './radio-overview/radio-overview-example';
6368
import {SidenavOverviewExample} from './sidenav-overview/sidenav-overview-example';
6469
import {SelectOverviewExample} from './select-overview/select-overview-example';
65-
import {AutocompleteOverviewExample} from './autocomplete-overview/autocomplete-overview-example';
6670
import {ChipsOverviewExample} from './chips-overview/chips-overview-example';
6771
import {ChipsStackedExample} from './chips-stacked/chips-stacked-example';
6872
import {SelectFormExample} from './select-form/select-form-example';
@@ -102,11 +106,17 @@ export const EXAMPLE_COMPONENTS = {
102106
selectorName: 'DialogOverviewExample, DialogOverviewExampleDialog',
103107
},
104108
'dialog-result': {
105-
title: 'Dailog with a result',
109+
title: 'Dialog with a result',
106110
component: DialogResultExample,
107111
additionalFiles: ['dialog-result-example-dialog.html'],
108112
selectorName: 'DialogResultExample, DialogResultExampleDialog',
109113
},
114+
'dialog-elements': {
115+
title: 'Dialog elements',
116+
component: DialogElementsExample,
117+
additionalFiles: ['dialog-elements-example-dialog.html'],
118+
selectorName: 'DialogElementsExample, DialogElementsExampleDialog',
119+
},
110120
'grid-list-dynamic': {title: 'Dynamic grid-list', component: GridListDynamicExample},
111121
'grid-list-overview': {title: 'Basic grid-list', component: GridListOverviewExample},
112122
'icon-overview': {title: 'Basic icons', component: IconOverviewExample},
@@ -176,6 +186,8 @@ export const EXAMPLE_LIST = [
176186
DialogOverviewExampleDialog,
177187
DialogResultExample,
178188
DialogResultExampleDialog,
189+
DialogElementsExample,
190+
DialogElementsExampleDialog,
179191
GridListDynamicExample,
180192
GridListOverviewExample,
181193
IconOverviewExample,
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
/** No CSS for this example */
1+
md-grid-tile {
2+
background: lightblue;
3+
}

src/assets/plunker/examples/grid-list-overview/grid-list-overview-example.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<md-grid-list cols="2">
1+
<md-grid-list cols="2" rowHeight="2:1">
22
<md-grid-tile>1</md-grid-tile>
33
<md-grid-tile>2</md-grid-tile>
44
<md-grid-tile>3</md-grid-tile>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {Component} from '@angular/core';
22

3-
43
@Component({
54
selector: 'grid-list-overview-example',
5+
styleUrls: ['./grid-list-overview-example.css'],
66
templateUrl: './grid-list-overview-example.html',
77
})
88
export class GridListOverviewExample {}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/** No CSS for this example */
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<md-icon svgIcon="thumbs-up"></md-icon>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import {Component} from '@angular/core';
2+
import {DomSanitizer} from '@angular/platform-browser';
3+
import {MdIconRegistry} from '@angular/material';
4+
5+
6+
@Component({
7+
selector: 'icon-svg-example',
8+
templateUrl: './icon-svg-example.html',
9+
})
10+
export class IconSvgExample {
11+
constructor(iconRegistry: MdIconRegistry, sanitizer: DomSanitizer) {
12+
iconRegistry.addSvgIcon(
13+
'thumbs-up',
14+
sanitizer.bypassSecurityTrustResourceUrl('assets/img/examples/thumbup-icon.svg'));
15+
}
16+
}
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
/** No CSS for this example */
1+
.mat-list-icon {
2+
color: rgba(0,0,0,0.54);
3+
}

src/assets/plunker/examples/list-sections/list-sections-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<md-list>
22
<h3 md-subheader>Folders</h3>
33
<md-list-item *ngFor="let folder of folders">
4-
<md-icon md-list-avatar>folder</md-icon>
4+
<md-icon md-list-icon>folder</md-icon>
55
<h4 md-line>{{folder.name}}</h4>
66
<p md-line> {{folder.updated | date}} </p>
77
</md-list-item>
88
<md-divider></md-divider>
99
<h3 md-subheader>Notes</h3>
1010
<md-list-item *ngFor="let note of notes">
11-
<md-icon md-list-avatar>note</md-icon>
11+
<md-icon md-list-icon>note</md-icon>
1212
<h4 md-line>{{note.name}}</h4>
1313
<p md-line> {{note.updated | date}} </p>
1414
</md-list-item>

src/assets/plunker/examples/progress-spinner-configurable/progress-spinner-configurable-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<md-card>
22
<md-card-content>
3-
<h2 class="example-h2">Progress circle configuration</h2>
3+
<h2 class="example-h2">Progress spinner configuration</h2>
44

55
<section class="example-section">
66
<label class="example-margin">Color:</label>
@@ -41,7 +41,7 @@ <h2 class="example-h2">Result</h2>
4141

4242
<md-progress-spinner
4343
class="example-margin"
44-
[color]="color"
44+
[attr.color]="color"
4545
[mode]="mode"
4646
[value]="value">
4747
</md-progress-spinner>

src/assets/plunker/examples/progress-spinner-configurable/progress-spinner-configurable-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {Component} from '@angular/core';
77
styleUrls: ['./progress-spinner-configurable-example.css'],
88
})
99
export class ProgressSpinnerConfigurableExample {
10-
color = 'praimry';
10+
color = 'primary';
1111
mode = 'determinate';
1212
value = 50;
1313
}

src/assets/plunker/examples/snack-bar-component/snack-bar-component-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ export class SnackBarComponentExample {
2020
@Component({
2121
selector: 'snack-bar-component-example-snack',
2222
templateUrl: './snack-bar-component-example-snack.html',
23-
styleUrls: ['./snack-bar-component-example.css'],
23+
styleUrls: ['./snack-bar-component-example-snack.css'],
2424
})
2525
export class PizzaPartyComponent {}

0 commit comments

Comments
 (0)