Skip to content

Commit 7b30fdc

Browse files
mmalerbaandrewseguin
authored andcommitted
fix(input): remove md-input and md-textarea in favor of md-input-container (#2788)
* remove md-input and md-textarea * fix demo * clean up filenames
1 parent 55b9224 commit 7b30fdc

25 files changed

+282
-1858
lines changed

src/demo-app/baseline/baseline-demo.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
| Text 3 |
1111
<md-radio-button value="option_3">Radio 3</md-radio-button>
1212
| Text 4 |
13-
<md-input placeholder="Input"></md-input>
14-
| Text 5 |
1513
<md-input-container>
1614
<input mdInput placeholder="Input">
1715
</md-input-container>
@@ -32,8 +30,6 @@ <h1>
3230
| Text 3 |
3331
<md-radio-button value="option_3">Radio 3</md-radio-button>
3432
| Text 4 |
35-
<md-input placeholder="Input"></md-input>
36-
| Text 5 |
3733
<md-input-container>
3834
<input mdInput placeholder="Input">
3935
</md-input-container>

src/demo-app/chips/chips-demo.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import {Component} from '@angular/core';
2-
import {MdInput} from '@angular/material';
1+
import {Component, ElementRef} from '@angular/core';
32

43
export interface Person {
54
name: string;
@@ -40,10 +39,10 @@ export class ChipsDemo {
4039
alert(message);
4140
}
4241

43-
add(input: MdInput): void {
44-
if (input.value && input.value.trim() != '') {
45-
this.people.push({ name: input.value.trim() });
46-
input.value = '';
42+
add(input: ElementRef): void {
43+
if (input.nativeElement.value && input.nativeElement.value.trim() != '') {
44+
this.people.push({ name: input.nativeElement.value.trim() });
45+
input.nativeElement.value = '';
4746
}
4847
}
4948

src/demo-app/demo-app-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {JazzDialog, ContentElementDialog, DialogDemo} from './dialog/dialog-demo
1212
import {RippleDemo} from './ripple/ripple-demo';
1313
import {IconDemo} from './icon/icon-demo';
1414
import {GesturesDemo} from './gestures/gestures-demo';
15-
import {InputDemo} from './input/input-demo';
1615
import {CardDemo} from './card/card-demo';
1716
import {ChipsDemo} from './chips/chips-demo';
1817
import {RadioDemo} from './radio/radio-demo';
@@ -63,7 +62,6 @@ import {InputContainerDemo} from './input/input-container-demo';
6362
GridListDemo,
6463
Home,
6564
IconDemo,
66-
InputDemo,
6765
InputContainerDemo,
6866
JazzDialog,
6967
ContentElementDialog,

src/demo-app/demo-app/routes.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {LiveAnnouncerDemo} from '../live-announcer/live-announcer-demo';
1010
import {ListDemo} from '../list/list-demo';
1111
import {IconDemo} from '../icon/icon-demo';
1212
import {ToolbarDemo} from '../toolbar/toolbar-demo';
13-
import {InputDemo} from '../input/input-demo';
1413
import {CheckboxDemo} from '../checkbox/checkbox-demo';
1514
import {OverlayDemo} from '../overlay/overlay-demo';
1615
import {PortalDemo} from '../portal/portal-demo';
@@ -51,7 +50,6 @@ export const DEMO_APP_ROUTES: Routes = [
5150
{path: 'projection', component: ProjectionDemo},
5251
{path: 'overlay', component: OverlayDemo},
5352
{path: 'checkbox', component: CheckboxDemo},
54-
{path: 'input', component: InputDemo},
5553
{path: 'input-container', component: InputContainerDemo},
5654
{path: 'toolbar', component: ToolbarDemo},
5755
{path: 'icon', component: IconDemo},

src/demo-app/dialog/dialog-demo.html

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,32 @@ <h1>Dialog demo</h1>
88
<h2>Dialog dimensions</h2>
99

1010
<p>
11-
<md-input [(ngModel)]="config.width" placeholder="Width"></md-input>
12-
<md-input [(ngModel)]="config.height" placeholder="Height"></md-input>
11+
<md-input-container>
12+
<input mdInput [(ngModel)]="config.width" placeholder="Width">
13+
</md-input-container>
14+
<md-input-container>
15+
<input mdInput [(ngModel)]="config.height" placeholder="Height">
16+
</md-input-container>
1317
</p>
1418

1519
<h2>Dialog position</h2>
1620

1721
<p>
18-
<md-input [(ngModel)]="config.position.top" (change)="config.position.bottom = ''" placeholder="Top"></md-input>
19-
<md-input [(ngModel)]="config.position.bottom" (change)="config.position.top = ''" placeholder="Bottom"></md-input>
22+
<md-input-container>
23+
<input mdInput [(ngModel)]="config.position.top" (change)="config.position.bottom = ''" placeholder="Top">
24+
</md-input-container>
25+
<md-input-container>
26+
<input mdInput [(ngModel)]="config.position.bottom" (change)="config.position.top = ''" placeholder="Bottom">
27+
</md-input-container>
2028
</p>
2129

2230
<p>
23-
<md-input [(ngModel)]="config.position.left" (change)="config.position.right = ''" placeholder="Left"></md-input>
24-
<md-input [(ngModel)]="config.position.right" (change)="config.position.left = ''" placeholder="Right"></md-input>
31+
<md-input-container>
32+
<input mdInput [(ngModel)]="config.position.left" (change)="config.position.right = ''" placeholder="Left">
33+
</md-input-container>
34+
<md-input-container>
35+
<input mdInput [(ngModel)]="config.position.right" (change)="config.position.left = ''" placeholder="Right">
36+
</md-input-container>
2537
</p>
2638

2739
<h2>Other options</h2>

src/demo-app/input/input-container-demo.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ <h4>Textarea</h4>
9292
<h4>Input</h4>
9393
<p>
9494
<md-input-container class="demo-full-width">
95-
<input md-input
95+
<input mdInput
9696
#characterCountInputHintExample
9797
placeholder="Character count (100 max)"
9898
maxLength="100"
@@ -104,7 +104,7 @@ <h4>Input</h4>
104104
<h4>Textarea</h4>
105105
<p>
106106
<md-input-container class="demo-full-width">
107-
<textarea md-input
107+
<textarea mdInput
108108
#characterCountTextareaHintExample
109109
placeholder="Character count (100 max)"
110110
maxLength="100">Hello world. How are you?</textarea>
@@ -150,7 +150,7 @@ <h4>Textarea</h4>
150150

151151
<p>
152152
<md-input-container>
153-
<input md-input>
153+
<input mdInput>
154154
<md-placeholder>
155155
I <md-icon class="demo-icons">favorite</md-icon> <b>bold</b> placeholder
156156
</md-placeholder>
@@ -174,7 +174,7 @@ <h4>Textarea</h4>
174174
<p>
175175
<md-checkbox [(ngModel)]="requiredField"> Check to make required:</md-checkbox>
176176
<md-input-container>
177-
<input md-input
177+
<input mdInput
178178
[required]="requiredField"
179179
[placeholder]="requiredField ? 'Required field' : 'Not required field'">
180180
</md-input-container>
@@ -210,8 +210,8 @@ <h4>Textarea</h4>
210210
</p>
211211

212212
<p>
213-
Empty: <md-input-container><input md-input></md-input-container>
214-
<label>Label: <md-input-container><input md-input></md-input-container></label>
213+
Empty: <md-input-container><input mdInput></md-input-container>
214+
<label>Label: <md-input-container><input mdInput></md-input-container></label>
215215
</p>
216216
</md-card-content>
217217
</md-card>
@@ -233,7 +233,7 @@ <h4>Textarea</h4>
233233
<td>{{i+1}}</td>
234234
<td>
235235
<md-input-container>
236-
<input md-input
236+
<input mdInput
237237
type="number"
238238
placeholder="value"
239239
aria-label="hello"

src/demo-app/input/input-container-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let max = 5;
88
moduleId: module.id,
99
selector: 'input-container-demo',
1010
templateUrl: 'input-container-demo.html',
11-
styleUrls: ['input-demo.css'],
11+
styleUrls: ['input-container-demo.css'],
1212
})
1313
export class InputContainerDemo {
1414
dividerColor: boolean;

src/demo-app/input/input-demo.html

Lines changed: 0 additions & 184 deletions
This file was deleted.

src/demo-app/input/input-demo.ts

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)