Skip to content

Commit 0a24558

Browse files
committed
s/side/position
1 parent 4f3823c commit 0a24558

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

src/demo-app/sidenav/sidenav-demo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2>Basic Use Case</h2>
1515
<input #myinput>
1616
</md-sidenav>
1717

18-
<md-sidenav #end side="end">
18+
<md-sidenav #end position="end">
1919
End Side Drawer
2020
<br>
2121
<button md-button (click)="end.close()">Close</button>

src/lib/sidenav/drawer.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,8 @@ class DrawerContainerNoDrawerTestApp { }
373373
@Component({
374374
template: `
375375
<md-drawer-container>
376-
<md-drawer side="start"> </md-drawer>
377-
<md-drawer side="end"> </md-drawer>
376+
<md-drawer [position]="start"></md-drawer>
377+
<md-drawer [position]="end"></md-drawer>
378378
</md-drawer-container>`,
379379
})
380380
class DrawerContainerTwoDrawerTestApp {
@@ -385,9 +385,9 @@ class DrawerContainerTwoDrawerTestApp {
385385
@Component({
386386
template: `
387387
<md-drawer-container (backdropClick)="backdropClicked()">
388-
<md-drawer #drawer side="start"
389-
(open)="open()"
390-
(close)="close()">
388+
<md-drawer #drawer [position]="start"
389+
(open)="open()"
390+
(close)="close()">
391391
<button #drawerButton>Content.</button>
392392
</md-drawer>
393393
<button (click)="drawer.open()" class="open" #openButton></button>
@@ -439,8 +439,8 @@ class DrawerSetToOpenedTrue { }
439439
@Component({
440440
template: `
441441
<md-drawer-container>
442-
<md-drawer #drawer1 [side]="drawer1Side"></md-drawer>
443-
<md-drawer #drawer2 [side]="drawer2Side"></md-drawer>
442+
<md-drawer #drawer1 [position]="drawer1Side"></md-drawer>
443+
<md-drawer #drawer2 [position]="drawer2Side"></md-drawer>
444444
</md-drawer-container>`,
445445
})
446446
class DrawerDynamicSide {
@@ -451,7 +451,7 @@ class DrawerDynamicSide {
451451
@Component({
452452
template: `
453453
<md-drawer-container>
454-
<md-drawer side="start" [mode]="mode">
454+
<md-drawer [position]="start" [mode]="mode">
455455
<a class="link1" href="#">link1</a>
456456
</md-drawer>
457457
<a class="link2" href="#">link2</a>

src/lib/sidenav/drawer.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class MdDrawerToggleResult {
7979
'(keydown)': 'handleKeydown($event)',
8080
// must prevent the browser from aligning text based on value
8181
'[attr.align]': 'null',
82-
'[class.mat-drawer-end]': 'side === "end"',
82+
'[class.mat-drawer-end]': 'position === "end"',
8383
'[class.mat-drawer-over]': 'mode === "over"',
8484
'[class.mat-drawer-push]': 'mode === "push"',
8585
'[class.mat-drawer-side]': 'mode === "side"',
@@ -97,22 +97,22 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
9797

9898
/** The side that the drawer is attached to. */
9999
@Input()
100-
get side() { return this._side; }
101-
set side(value) {
100+
get position() { return this._position; }
101+
set position(value) {
102102
// Make sure we have a valid value.
103103
value = value === 'end' ? 'end' : 'start';
104-
if (value != this._side) {
105-
this._side = value;
104+
if (value != this._position) {
105+
this._position = value;
106106
this.onAlignChanged.emit();
107-
this.onSideChanged.emit();
107+
this.onPositionChanged.emit();
108108
}
109109
}
110-
private _side: 'start' | 'end' = 'start';
110+
private _position: 'start' | 'end' = 'start';
111111

112112
/** @deprecated */
113113
@Input()
114-
get align() { return this.side; }
115-
set align(value) { this.side = value; }
114+
get align() { return this.position; }
115+
set align(value) { this.position = value; }
116116

117117
/** Mode of the drawer; one of 'over', 'push' or 'side'. */
118118
@Input() mode: 'over' | 'push' | 'side' = 'over';
@@ -146,7 +146,7 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
146146
@Output('close') onClose = new EventEmitter<MdDrawerToggleResult | void>();
147147

148148
/** Event emitted when the drawer's side changes. */
149-
@Output('side-changed') onSideChanged = new EventEmitter<void>();
149+
@Output('side-changed') onPositionChanged = new EventEmitter<void>();
150150

151151
/** @deprecated */
152152
@Output('align-changed') onAlignChanged = new EventEmitter<void>();
@@ -395,7 +395,7 @@ export class MdDrawerContainer implements AfterContentInit {
395395
}
396396
// NOTE: We need to wait for the microtask queue to be empty before validating,
397397
// since both drawers may be swapping sides at the same time.
398-
takeUntil.call(drawer.onSideChanged, this._drawers.changes).subscribe(() =>
398+
takeUntil.call(drawer.onPositionChanged, this._drawers.changes).subscribe(() =>
399399
first.call(this._ngZone.onMicrotaskEmpty).subscribe(() => this._validateDrawers()));
400400
}
401401

@@ -414,7 +414,7 @@ export class MdDrawerContainer implements AfterContentInit {
414414

415415
// Ensure that we have at most one start and one end drawer.
416416
this._drawers.forEach(drawer => {
417-
if (drawer.side == 'end') {
417+
if (drawer.position == 'end') {
418418
if (this._end != null) {
419419
throwMdDuplicatedDrawerError('end');
420420
}

src/lib/sidenav/sidenav.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import {animate, state, style, transition, trigger} from '@angular/animations';
4141
'(keydown)': 'handleKeydown($event)',
4242
// must prevent the browser from aligning text based on value
4343
'[attr.align]': 'null',
44-
'[class.mat-drawer-end]': 'side === "end"',
44+
'[class.mat-drawer-end]': 'position === "end"',
4545
'[class.mat-drawer-over]': 'mode === "over"',
4646
'[class.mat-drawer-push]': 'mode === "push"',
4747
'[class.mat-drawer-side]': 'mode === "side"',

0 commit comments

Comments
 (0)