diff --git a/src/components/nav/nav.ts b/src/components/nav/nav.ts index 0eab550668..1f8318d018 100644 --- a/src/components/nav/nav.ts +++ b/src/components/nav/nav.ts @@ -5,7 +5,6 @@ import { Config } from '../../config/config'; import { DeepLinker } from '../../navigation/deep-linker'; import { DomController } from '../../platform/dom-controller'; import { GestureController } from '../../gestures/gesture-controller'; -import { isTrueProperty } from '../../util/util'; import { Keyboard } from '../../platform/keyboard'; import { NavController } from '../../navigation/nav-controller'; import { NavControllerBase } from '../../navigation/nav-controller-base'; @@ -56,6 +55,7 @@ import { RootNode } from '../split-pane/split-pane'; providers: [{provide: RootNode, useExisting: forwardRef(() => Nav) }] }) export class Nav extends NavControllerBase implements AfterViewInit, RootNode { + private _root: any; private _hasInit: boolean = false; @@ -149,18 +149,6 @@ export class Nav extends NavControllerBase implements AfterViewInit, RootNode { */ @Input() rootParams: any; - /** - * @input {boolean} If true, swipe to go back is enabled. - */ - @Input() - get swipeBackEnabled(): boolean { - return this._sbEnabled; - } - set swipeBackEnabled(val: boolean) { - this._sbEnabled = isTrueProperty(val); - this._swipeBackCheck(); - } - /** * @hidden */ diff --git a/src/components/segment/segment.ios.scss b/src/components/segment/segment.ios.scss index 0d538c851c..834e9625fe 100644 --- a/src/components/segment/segment.ios.scss +++ b/src/components/segment/segment.ios.scss @@ -129,6 +129,7 @@ $segment-button-ios-toolbar-icon-line-height: 2.4rem !default; border-radius: 0 $segment-button-ios-border-radius $segment-button-ios-border-radius 0; } } + .segment-ios.segment-disabled { opacity: .4; diff --git a/src/components/tabs/tab.ts b/src/components/tabs/tab.ts index 5c7352cf08..9f81934581 100644 --- a/src/components/tabs/tab.ts +++ b/src/components/tabs/tab.ts @@ -233,17 +233,6 @@ export class Tab extends NavControllerBase { this._isShown = isTrueProperty(val); } - /** - * @input {boolean} If true, swipe to go back is enabled. - */ - @Input() - get swipeBackEnabled(): boolean { - return this._sbEnabled; - } - set swipeBackEnabled(val: boolean) { - this._sbEnabled = isTrueProperty(val); - } - /** * @input {boolean} If true, hide the tabs on child pages. */ diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts index 446cf2326f..ee324bd912 100644 --- a/src/navigation/nav-controller-base.ts +++ b/src/navigation/nav-controller-base.ts @@ -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, diff --git a/src/navigation/nav-controller.ts b/src/navigation/nav-controller.ts index e5e0674d00..b0f00d3d7d 100644 --- a/src/navigation/nav-controller.ts +++ b/src/navigation/nav-controller.ts @@ -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