Skip to content

fix(sidenav): fixes sidenav RTL support for side mode #465

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
May 19, 2016
Merged

fix(sidenav): fixes sidenav RTL support for side mode #465

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
9 changes: 2 additions & 7 deletions src/components/sidenav/sidenav.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {
Component,
ContentChildren,
ElementRef,
Host,
HostBinding,
Input,
Optional,
Expand All @@ -19,15 +18,13 @@ import {PromiseCompleter} from '@angular2-material/core/async/promise-completer'
import {MdError} from '@angular2-material/core/errors/error';
import { BooleanFieldValue } from '@angular2-material/core/annotations/field-value';


/** Exception thrown when two MdSidenav are matching the same side. */
export class MdDuplicatedSidenavError extends MdError {
constructor(align: string) {
super(`A sidenav was already declared for 'align="${align}"'`);
}
}


/**
* <md-sidenav> component.
*
Expand Down Expand Up @@ -223,8 +220,6 @@ export class MdSidenav {
private _closePromiseReject: () => void;
}



/**
* <md-sidenav-layout> component.
*
Expand Down Expand Up @@ -263,12 +258,12 @@ export class MdSidenavLayout implements AfterContentInit {
private _left: MdSidenav;
private _right: MdSidenav;

constructor(@Optional() @Host() private _dir: Dir, private _element: ElementRef,
constructor(@Optional() private _dir: Dir, private _element: ElementRef,
private _renderer: Renderer) {
// If a `Dir` directive exists up the tree, listen direction changes and update the left/right
// properties to point to the proper start/end.
if (_dir != null) {
_dir.dirChange.add(() => this._validateDrawers());
_dir.dirChange.subscribe(() => this._validateDrawers());
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/demo-app/sidenav/sidenav-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import {MdButton} from '@angular2-material/button/button';
import {MD_SIDENAV_DIRECTIVES} from '@angular2-material/sidenav/sidenav';

@Component({
moduleId: module.id,
selector: 'sidenav-demo',
templateUrl: 'sidenav-demo.html',
styleUrls: ['sidenav-demo.css'],
directives: [MD_SIDENAV_DIRECTIVES, MdButton]
moduleId: module.id,
selector: 'sidenav-demo',
templateUrl: 'sidenav-demo.html',
styleUrls: ['sidenav-demo.css'],
directives: [MD_SIDENAV_DIRECTIVES, MdButton]
})
export class SidenavDemo { }
export class SidenavDemo {}