javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 05:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(split-panel): split panel support for ion-nav and ion-menu (#10343)

Browse Source 
* feat(split-panel): split panel support for ion-nav and ion-menu

Revert some changes

adds support split-panel support for tabs

Removes .orig

removes e2e.ts

Removes unneeded changes in menu.ts

improves stuff

* fix(split-panel): resize is called when menu wraps a ion-nav

* test(split-panel): improves split-panel/basic test

* feat(split-panel): ionChange is an ng2 @Output()

* fix(split-panel): fix tabs as side content

* fix(menu): forzedClose works as expected

* feat(split-panel): split-panel works with several menus

* chore(split-panel): renames to split-pane

* refactor(split-pane): splitPane can be injected

* fix(split-pane): it is a directive

* fix(slides): integration with split-panel

* Make gulp validate happy
This commit is contained in:
Manu MA
2017-03-03 20:13:07 +01:00
committed by GitHub
parent 66fcaa7a63
commit 9e4c3a6e3e
36 changed files with 1121 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/navigation/nav-controller-base.ts
View File

@ -800,7 +800,7 @@ export class NavControllerBase extends Ion implements NavController {
_cleanup(activeView: ViewController) {
// ok, cleanup time!! Destroy all of the views that are
// INACTIVE and come after the active view
const activeViewIndex = this.indexOf(activeView);
const activeViewIndex = this._views.indexOf(activeView);
const views = this._views;
let reorderZIndexes = false;
let view: ViewController;
@ -1019,7 +1019,8 @@ export class NavControllerBase extends Ion implements NavController {
if (!view) {
view = this.getActive();
}
return this._views[this.indexOf(view) - 1];
const views = this._views;
return views[views.indexOf(view) - 1];
}
first(): ViewController {
@ -1064,6 +1065,15 @@ export class NavControllerBase extends Ion implements NavController {
this._viewport = val;
}
resize() {
const active = this.getActive();
if (!active) {
return;
}
const content = active.getIONContent();
content && content.resize();
}
}
let ctrlIds = -1;

5
src/navigation/nav-controller.ts
View File

@ -609,4 +609,9 @@ export abstract class NavController {
* @private
*/
abstract registerChildNav(nav: any): void;
/**
* @private
*/
abstract resize(): void;
}