Skip to content

Commit 4cf2503

Browse files
committed
comments
1 parent 14e0268 commit 4cf2503

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/lib/input/input-container.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<div class="md-input-wrapper">
22
<div class="md-input-table">
33
<div class="md-input-prefix">
4-
<ng-content select="[mdPrefix], [matPrefix], [md-prefix], [mat-prefix]"></ng-content>
4+
<!-- TODO(andrewseguin): remove [md-prefix] -->
5+
<ng-content select="[mdPrefix], [matPrefix], [md-prefix]"></ng-content>
56
</div>
67

78
<div class="md-input-infix" [class.md-end]="align == 'end'">
@@ -15,14 +16,15 @@
1516
[class.md-accent]="dividerColor == 'accent'"
1617
[class.md-warn]="dividerColor == 'warn'"
1718
*ngIf="_hasPlaceholder()">
18-
<ng-content select="md-placeholder"></ng-content>
19+
<ng-content select="md-placeholder, mat-placeholder"></ng-content>
1920
{{_mdInputChild.placeholder}}
2021
<span class="md-placeholder-required" *ngIf="_mdInputChild.required">*</span>
2122
</label>
2223
</div>
2324

2425
<div class="md-input-suffix">
25-
<ng-content select="[mdSuffix], [matSuffix], [md-suffix], [mat-suffix]"></ng-content>
26+
<!-- TODO(andrewseguin): remove [md-suffix] -->
27+
<ng-content select="[mdSuffix], [matSuffix], [md-suffix]"></ng-content>
2628
</div>
2729
</div>
2830

@@ -34,6 +36,6 @@
3436
[class.md-warn]="dividerColor == 'warn'"></span>
3537
</div>
3638

37-
<div *ngIf="hintLabel != ''" [attr.id]="_hintLabelId" class="md-hint">{{hintLabel}}</div>
39+
<div *ngIf="hintLabel != ''" [attr.id]="_hintLabelId" class="md-hint, mat-hint">{{hintLabel}}</div>
3840
<ng-content select="md-hint"></ng-content>
3941
</div>

src/lib/menu/menu-trigger.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {MenuPositionX, MenuPositionY} from './menu-positions';
3030
/**
3131
* This directive is intended to be used in conjunction with an md-menu tag. It is
3232
* responsible for toggling the display of the provided menu instance.
33+
* TODO(andrewseguin): Remove the kebab versions in favor of camelCased attribute selectors
3334
*/
3435
@Directive({
3536
selector: `[md-menu-trigger-for], [mat-menu-trigger-for],

0 commit comments

Comments
 (0)