Skip to content

Commit d8657a0

Browse files
committed
addressed comments
1 parent 79524a2 commit d8657a0

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ <h2>Dynamic Alignment Sidenav</h2>
5555
<md-sidenav #dynamicAlignSidenav2 mode="side" [align]="invert ? 'start' : 'end'">End</md-sidenav>
5656

5757
<div class="demo-sidenav-content">
58-
<button (click)="dynamicAlignSidenav1.toggle(); dynamicAlignSidenav2.toggle()">
58+
<button (click)="toggleDynamicAlignSidenavs()">
5959
Toggle sidenavs
6060
</button>
6161
<button (click)="invert = !invert">Change sides</button>

src/demo-app/sidenav/sidenav-demo.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {Component, ViewEncapsulation} from '@angular/core';
1+
import {Component, ViewEncapsulation, ViewChild} from '@angular/core';
2+
import {MdSidenav} from '@angular/material';
23

34

45
@Component({
@@ -9,5 +10,13 @@ import {Component, ViewEncapsulation} from '@angular/core';
910
encapsulation: ViewEncapsulation.None,
1011
})
1112
export class SidenavDemo {
13+
@ViewChild('dynamicAlignSidenav1') sidenav1 : MdSidenav;
14+
@ViewChild('dynamicAlignSidenav2') sidenav2 : MdSidenav;
15+
1216
invert = false;
17+
18+
toggleDynamicAlignSidenavs() {
19+
this.sidenav1.toggle();
20+
this.sidenav2.toggle();
21+
}
1322
}

src/lib/sidenav/sidenav.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {MdSidenav, MdSidenavModule, MdSidenavToggleResult} from './sidenav';
55
import {A11yModule} from '../core/a11y/index';
66
import {PlatformModule} from '../core/platform/index';
77
import {ESCAPE} from '../core/keyboard/keycodes';
8+
import {MdDuplicatedSidenavError} from '../../../dist/@angular/material/sidenav/sidenav';
89

910

1011
function endSidenavTransition(fixture: ComponentFixture<any>) {
@@ -380,7 +381,7 @@ describe('MdSidenav', () => {
380381
const testComponent: SidenavDynamicAlign = fixture.debugElement.componentInstance;
381382
testComponent.sidenav1Align = 'end';
382383

383-
expect(() => fixture.detectChanges()).toThrow();
384+
expect(() => fixture.detectChanges()).toThrow(new MdDuplicatedSidenavError('end'));
384385
});
385386

386387
it('should not throw when sidenavs swap sides', () => {

0 commit comments

Comments
 (0)