mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
Merge branch 'decorator-inheritance'
This commit is contained in:
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user