Skip to content
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.

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

fix(compatibility): add missing mat- selectors #2923

Merged
merged 3 commits into from
Feb 9, 2017

Conversation

andrewseguin
Copy link
Contributor

No description provided.

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Feb 3, 2017
@@ -1,6 +1,8 @@
<div class="md-input-wrapper">
<div class="md-input-table">
<div class="md-input-prefix"><ng-content select="[mdPrefix], [md-prefix]"></ng-content></div>
<div class="md-input-prefix">
<ng-content select="[mdPrefix], [matPrefix], [md-prefix], [mat-prefix]"></ng-content>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't add [mat-prefix], leave TODO to kill [md-prefix]

@@ -19,7 +21,9 @@
</label>
</div>

<div class="md-input-suffix"><ng-content select="[mdSuffix], [md-suffix]"></ng-content></div>
<div class="md-input-suffix">
<ng-content select="[mdSuffix], [matSuffix], [md-suffix], [mat-suffix]"></ng-content>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no [mat-suffix], TODO kill [md-suffix]

@@ -32,7 +32,8 @@ import {MenuPositionX, MenuPositionY} from './menu-positions';
* responsible for toggling the display of the provided menu instance.
*/
@Directive({
selector: '[md-menu-trigger-for], [mat-menu-trigger-for], [mdMenuTriggerFor]',
selector: `[md-menu-trigger-for], [mat-menu-trigger-for],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO kill kebab versions

Copy link
Contributor

@tinayuangao tinayuangao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mmalerba
Copy link
Contributor

mmalerba commented Feb 4, 2017

tests seem unhappy for some reason

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

<div *ngIf="hintLabel != ''" [attr.id]="_hintLabelId" class="md-hint">{{hintLabel}}</div>
<div *ngIf="hintLabel != ''" [attr.id]="_hintLabelId" class="md-hint, mat-hint">{{hintLabel}}</div>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't md-hint be replaced with mat-hint rather than appended? Either way, comma should be removed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the comma might be what's breaking the tests

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh bugger I totally put that in the wrong spot, it should have been in the select attribute of the ng-content below it

Copy link
Contributor

@kara kara left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewseguin andrewseguin added the action: merge The PR is ready for merge by the caretaker label Feb 8, 2017
@tinayuangao tinayuangao merged commit f29f7ab into angular:master Feb 9, 2017
@andrewseguin andrewseguin deleted the compat-consistency branch February 10, 2017 00:07
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants