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

Merge branch 'decorator-inheritance'

Browse Source
This commit is contained in:
Manuel Mtz-Almeida
2017-04-05 20:30:05 +02:00
parent 0a97cf2d5f 404d977c81
commit 55dfd254e5
5 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { ComponentRef, ComponentFactoryResolver, ElementRef, EventEmitter, NgZone, ReflectiveInjector, Renderer, ViewContainerRef } from '@angular/core';
import { ComponentRef, Input, ComponentFactoryResolver, ElementRef, EventEmitter, NgZone, ReflectiveInjector, Renderer, ViewContainerRef } from '@angular/core';
import { AnimationOptions } from '../animations/animation';
import { App } from '../components/app/app';
@ -9,7 +9,7 @@ import { setZIndex } from './nav-util';
import { DeepLinker } from './deep-linker';
import { DomController } from '../platform/dom-controller';
import { GestureController } from '../gestures/gesture-controller';
import { isBlank, isNumber, isPresent, assert, removeArrayItem } from '../util/util';
import { isBlank, isNumber, isPresent, isTrueProperty, assert, removeArrayItem } from '../util/util';
import { isViewController, ViewController } from './view-controller';
import { Ion } from '../components/ion';
import { Keyboard } from '../platform/keyboard';
@ -49,6 +49,15 @@ export class NavControllerBase extends Ion implements NavController {
id: string;
@Input()
get swipeBackEnabled(): boolean {
return this._sbEnabled;
}
set swipeBackEnabled(val: boolean) {
this._sbEnabled = isTrueProperty(val);
this._swipeBackCheck();
}
constructor(
public parent: any,
public _app: App,

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

@ -403,6 +403,11 @@ export abstract class NavController {
*/
config: Config;
/**
* @input {boolean} If true, swipe to go back is enabled.
*/
swipeBackEnabled: boolean;
/**
* Push a new component onto the current navigation stack. Pass any aditional information
* along as an object. This additional information is accessible through NavParams