Skip to content

fix: add mat exportAs and class aliases #7106

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

Merged
merged 1 commit into from
Sep 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 62 additions & 39 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
"node": ">= 5.4.1"
},
"dependencies": {
"@angular/animations": "~4.3.6",
"@angular/common": "~4.3.6",
"@angular/compiler": "~4.3.6",
"@angular/core": "~4.3.6",
"@angular/forms": "~4.3.6",
"@angular/http": "~4.3.6",
"@angular/platform-browser": "~4.3.6",
"@angular/animations": "~4.4.0-RC.0",
"@angular/common": "~4.4.0-RC.0",
"@angular/compiler": "~4.4.0-RC.0",
"@angular/core": "~4.4.0-RC.0",
"@angular/forms": "~4.4.0-RC.0",
"@angular/http": "~4.4.0-RC.0",
"@angular/platform-browser": "~4.4.0-RC.0",
"core-js": "^2.4.1",
"rxjs": "^5.0.1",
"systemjs": "0.19.43",
Expand All @@ -40,11 +40,11 @@
"zone.js": "^0.8.12"
},
"devDependencies": {
"@angular/compiler-cli": "~4.3.6",
"@angular/platform-browser-dynamic": "~4.3.6",
"@angular/platform-server": "~4.3.6",
"@angular/router": "~4.3.6",
"@angular/tsc-wrapped": "~4.3.6",
"@angular/compiler-cli": "~4.4.0-RC.0",
"@angular/platform-browser-dynamic": "~4.4.0-RC.0",
"@angular/platform-server": "~4.4.0-RC.0",
"@angular/router": "~4.4.0-RC.0",
"@angular/tsc-wrapped": "~4.4.0-RC.0",
"@google-cloud/storage": "^1.1.1",
"@types/chalk": "^0.4.31",
"@types/fs-extra": "^3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/lib/autocomplete/autocomplete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export class MdAutocompleteSelectedEvent {
styleUrls: ['autocomplete.css'],
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
exportAs: 'mdAutocomplete',
exportAs: 'mdAutocomplete, matAutocomplete',
host: {
'class': 'mat-autocomplete'
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/button-toggle/button-toggle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export class MdButtonToggleChange {
'class': 'mat-button-toggle-group',
'[class.mat-button-toggle-vertical]': 'vertical'
},
exportAs: 'mdButtonToggleGroup',
exportAs: 'mdButtonToggleGroup, matButtonToggleGroup',
})
export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
implements ControlValueAccessor, CanDisable {
Expand Down Expand Up @@ -229,7 +229,7 @@ export class MdButtonToggleGroup extends _MdButtonToggleGroupMixinBase
/** Multiple selection button-toggle group. `ngModel` is not supported in this mode. */
@Directive({
selector: 'md-button-toggle-group[multiple], mat-button-toggle-group[multiple]',
exportAs: 'mdButtonToggleGroup',
exportAs: 'mdButtonToggleGroup, matButtonToggleGroup',
inputs: ['disabled'],
host: {
'class': 'mat-button-toggle-group',
Expand Down
2 changes: 1 addition & 1 deletion src/lib/chips/chip-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {coerceBooleanProperty} from '@angular/cdk/coercion';
moduleId: module.id,
selector: 'md-chip-list, mat-chip-list',
template: `<div class="mat-chip-list-wrapper"><ng-content></ng-content></div>`,
exportAs: 'mdChipList',
exportAs: 'mdChipList, matChipList',
host: {
'[attr.tabindex]': '_tabIndex',
'role': 'listbox',
Expand Down
2 changes: 1 addition & 1 deletion src/lib/chips/chip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class MdBasicChip { }
selector: `md-basic-chip, [md-basic-chip], md-chip, [md-chip],
mat-basic-chip, [mat-basic-chip], mat-chip, [mat-chip]`,
inputs: ['color', 'disabled'],
exportAs: 'mdChip',
exportAs: 'mdChip, matChip',
host: {
'class': 'mat-chip',
'tabindex': '-1',
Expand Down
2 changes: 1 addition & 1 deletion src/lib/core/ripple/ripple.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const MD_RIPPLE_GLOBAL_OPTIONS =

@Directive({
selector: '[md-ripple], [mat-ripple], [mdRipple], [matRipple]',
exportAs: 'mdRipple',
exportAs: 'mdRipple, matRipple',
host: {
'class': 'mat-ripple',
'[class.mat-ripple-unbounded]': 'unbounded'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/datepicker/datepicker-input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export class MdDatepickerInputEvent<D> {
'(blur)': '_onTouched()',
'(keydown)': '_onKeydown($event)',
},
exportAs: 'mdDatepickerInput',
exportAs: 'mdDatepickerInput, matDatepickerInput',
})
export class MdDatepickerInput<D> implements AfterContentInit, ControlValueAccessor, OnDestroy,
Validator {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/input/autosize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {Platform} from '@angular/cdk/platform';
@Directive({
selector: `textarea[md-autosize], textarea[mdTextareaAutosize],
textarea[mat-autosize], textarea[matTextareaAutosize]`,
exportAs: 'mdTextareaAutosize',
exportAs: 'mdTextareaAutosize, matTextareaAutosize',
host: {
// Textarea elements that have the directive applied should have a single row by default.
// Browsers normally show two rows by default and therefore this limits the minRows binding.
Expand Down
Loading