Merge branch '2.0' into layout-refactor

# Conflicts:
#	src/components/tabs/test/advanced/index.ts
This commit is contained in:
Adam Bradley
2016-06-21 11:37:47 -05:00
32 changed files with 876 additions and 297 deletions

View File

@ -1752,6 +1752,13 @@ export class NavController extends Ion {
return this._views.length;
}
/**
* @private
*/
isSwipeBackEnabled(): boolean {
return this._sbEnabled;
}
/**
* Returns the root `NavController`.
* @returns {NavController}