Skip to content

chore: bump remaining 6.0.0 deletion targets to 7.0.0 #10790

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.

Sign up for GitHub

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
Apr 10, 2018
Merged

chore: bump remaining 6.0.0 deletion targets to 7.0.0 #10790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/lib/menu/menu-directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export class MatMenu implements OnInit, AfterContentInit, MatMenuPanel, OnDestro
* menu template that displays in the overlay container. Otherwise, it's difficult
* to style the containing menu from outside the component.
* @deprecated Use `panelClass` instead.
* @deletion-target 6.0.0
* @deletion-target 7.0.0
*/
@Input()
get classList(): string { return this.panelClass; }
Expand All @@ -204,7 +204,7 @@ export class MatMenu implements OnInit, AfterContentInit, MatMenuPanel, OnDestro
/**
* Event emitted when the menu is closed.
* @deprecated Switch to `closed` instead
* @deletion-target 6.0.0
* @deletion-target 7.0.0
*/
@Output() close = this.closed;

Expand Down Expand Up @@ -318,13 +318,13 @@ export class MatMenu implements OnInit, AfterContentInit, MatMenuPanel, OnDestro

/** Starts the enter animation. */
_startAnimation() {
// @deletion-target 6.0.0 Combine with _resetAnimation.
// @deletion-target 7.0.0 Combine with _resetAnimation.
this._panelAnimationState = 'enter';
}

/** Resets the panel animation to its initial state. */
_resetAnimation() {
// @deletion-target 6.0.0 Combine with _startAnimation.
// @deletion-target 7.0.0 Combine with _startAnimation.
this._panelAnimationState = 'void';
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/menu/menu-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class MatMenuItem extends _MatMenuItemMixinBase
@Inject(DOCUMENT) document?: any,
private _focusMonitor?: FocusMonitor) {

// @deletion-target 6.0.0 make `_focusMonitor` and `document` required params.
// @deletion-target 7.0.0 make `_focusMonitor` and `document` required params.
super();

if (_focusMonitor) {
Expand Down
7 changes: 4 additions & 3 deletions src/lib/menu/menu-trigger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {

/**
* @deprecated
* @deletion-target 6.0.0
* @deletion-target 7.0.0
*/
@Input('mat-menu-trigger-for')
get _deprecatedMatMenuTriggerFor(): MatMenuPanel {
Expand All @@ -107,7 +107,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
/**
* Event emitted when the associated menu is opened.
* @deprecated Switch to `menuOpened` instead
* @deletion-target 6.0.0
* @deletion-target 7.0.0
*/
@Output() readonly onMenuOpen: EventEmitter<void> = this.menuOpened;

Expand All @@ -117,7 +117,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
/**
* Event emitted when the associated menu is closed.
* @deprecated Switch to `menuClosed` instead
* @deletion-target 6.0.0
* @deletion-target 7.0.0
*/
@Output() readonly onMenuClose: EventEmitter<void> = this.menuClosed;

Expand All @@ -129,6 +129,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
@Optional() @Self() private _menuItemInstance: MatMenuItem,
@Optional() private _dir: Directionality,
// TODO(crisbeto): make the _focusMonitor required when doing breaking changes.
// @deletion-target 7.0.0
private _focusMonitor?: FocusMonitor) {

if (_menuItemInstance) {
Expand Down