javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(nav): ion-nav inside ion-content work properly

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-10-15 02:59:57 +02:00
parent 3283347149
commit ba557acb4f
8 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/navigation/view-controller.ts
View File

@ -6,6 +6,7 @@ import { Navbar } from '../components/navbar/navbar';
import { NavControllerBase } from './nav-controller-base';
import { NavOptions, ViewState } from './nav-util';
import { NavParams } from './nav-params';
import { Content } from '../components/content/content';
/**
@ -28,6 +29,8 @@ import { NavParams } from './nav-params';
export class ViewController {
private _cntDir: any;
private _cntRef: ElementRef;
private _ionCntDir: Content;
private _ionCntRef: ElementRef;
private _hdrDir: Header;
private _ftrDir: Footer;
private _isHidden: boolean = false;
@ -308,7 +311,7 @@ export class ViewController {
/**
* @returns {component} Returns the Page's Content component reference.
*/
getContent() {
getContent(): any {
return this._cntDir;
}
@ -326,6 +329,36 @@ export class ViewController {
return this._cntRef;
}
/**
* @private
*/
_setIONContent(content: Content) {
this._setContent(content);
this._ionCntDir = content;
}
/**
* @private
*/
getIONContent(): Content {
return this._ionCntDir;
}
/**
* @private
*/
_setIONContentRef(elementRef: ElementRef) {
this._setContentRef(elementRef);
this._ionCntRef = elementRef;
}
/**
* @private
*/
getIONContentRef(): ElementRef {
return this._ionCntRef;
}
/**
* @private
*/