diff --git a/demos/events/main.html b/demos/events/main.html index 3704fc995d..0a7197ad94 100644 --- a/demos/events/main.html +++ b/demos/events/main.html @@ -24,4 +24,4 @@ - + diff --git a/demos/id/main.html b/demos/id/main.html index f33edaad89..c14c6228da 100644 --- a/demos/id/main.html +++ b/demos/id/main.html @@ -31,4 +31,4 @@ - + diff --git a/demos/menu/main.html b/demos/menu/main.html index f33edaad89..c14c6228da 100644 --- a/demos/menu/main.html +++ b/demos/menu/main.html @@ -31,4 +31,4 @@ - + diff --git a/ionic/components/action-sheet/action-sheet.ios.scss b/ionic/components/action-sheet/action-sheet.ios.scss index bdbb0d2b94..ef38bdc5af 100644 --- a/ionic/components/action-sheet/action-sheet.ios.scss +++ b/ionic/components/action-sheet/action-sheet.ios.scss @@ -67,7 +67,7 @@ ion-action-sheet { .action-sheet-button { padding: $action-sheet-ios-button-padding; - + margin: 0; min-height: $action-sheet-ios-button-min-height; border-bottom: $action-sheet-ios-button-border-width $action-sheet-ios-button-border-style $action-sheet-ios-border-color; diff --git a/ionic/components/action-sheet/action-sheet.ts b/ionic/components/action-sheet/action-sheet.ts index 9b0de676f6..ed3a50cf8d 100644 --- a/ionic/components/action-sheet/action-sheet.ts +++ b/ionic/components/action-sheet/action-sheet.ts @@ -140,7 +140,7 @@ export class ActionSheet extends ViewController { * |----------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------| * | text | `string` | The buttons text | * | icon | `icon` | The buttons icons | - * | handler | `any` | An express the button shoule evaluate | + * | handler | `any` | An express the button should evaluate | * | cssClass | `string` | An additional class for custom styles | * | role | `string` | How the button should be displayed, `destructive` or `cancel`. If not role is provided, it will display the button without any additional styles | * diff --git a/ionic/components/menu/test/basic/main.html b/ionic/components/menu/test/basic/main.html index 9c1a9f1ca3..fbe412b2dc 100644 --- a/ionic/components/menu/test/basic/main.html +++ b/ionic/components/menu/test/basic/main.html @@ -138,6 +138,6 @@ - +
\ No newline at end of file diff --git a/ionic/components/menu/test/disable-swipe/main.html b/ionic/components/menu/test/disable-swipe/main.html index 71b314b01c..9f8a62db37 100644 --- a/ionic/components/menu/test/disable-swipe/main.html +++ b/ionic/components/menu/test/disable-swipe/main.html @@ -33,4 +33,4 @@ - + diff --git a/ionic/components/menu/test/enable-disable/main.html b/ionic/components/menu/test/enable-disable/main.html index c3a4f5e835..7f75954b2f 100644 --- a/ionic/components/menu/test/enable-disable/main.html +++ b/ionic/components/menu/test/enable-disable/main.html @@ -76,4 +76,4 @@ - + diff --git a/ionic/components/menu/test/multiple/main.html b/ionic/components/menu/test/multiple/main.html index 60cc884048..3bc84f9324 100644 --- a/ionic/components/menu/test/multiple/main.html +++ b/ionic/components/menu/test/multiple/main.html @@ -33,4 +33,4 @@ - + diff --git a/ionic/components/menu/test/overlay/main.html b/ionic/components/menu/test/overlay/main.html index b6c067900d..d2cc66f6af 100644 --- a/ionic/components/menu/test/overlay/main.html +++ b/ionic/components/menu/test/overlay/main.html @@ -37,4 +37,4 @@ - + diff --git a/ionic/components/menu/test/push/main.html b/ionic/components/menu/test/push/main.html index 44dbebbeb2..0ffd95b46d 100644 --- a/ionic/components/menu/test/push/main.html +++ b/ionic/components/menu/test/push/main.html @@ -37,4 +37,4 @@ - + diff --git a/ionic/components/menu/test/reveal/main.html b/ionic/components/menu/test/reveal/main.html index 4fb7983947..f2407974c2 100644 --- a/ionic/components/menu/test/reveal/main.html +++ b/ionic/components/menu/test/reveal/main.html @@ -36,4 +36,4 @@ - + \ No newline at end of file diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts index a9c1a41e6f..4e3477006b 100644 --- a/ionic/components/nav/nav-controller.ts +++ b/ionic/components/nav/nav-controller.ts @@ -108,9 +108,9 @@ export class NavController extends Ion { private _init = false; private _trans: Transition; private _sbGesture: SwipeBackGesture; - private _sbEnabled: boolean; private _sbThreshold: number; + protected _sbEnabled: boolean; protected _ids: number = -1; protected _trnsDelay: any; protected _trnsTime: number = 0; @@ -1288,7 +1288,7 @@ export class NavController extends Ion { let shouldResetZIndex = this._views.some(v => v.zIndex < 0); if (shouldResetZIndex) { this._views.forEach(view => { - view.setZIndex( view.zIndex + INIT_ZINDEX + 1, this._renderer ); + view.setZIndex(view.zIndex + INIT_ZINDEX + 1, this._renderer); }); } } @@ -1401,7 +1401,7 @@ export class NavController extends Ion { // start the transition, fire callback when done... this._transition(enteringView, leavingView, opts, (hasCompleted: boolean) => { // swipe back has finished!! - console.debug('swipeBack, hasCompleted', hasCompleted); + console.debug('swipeBack, hasCompleted', hasCompleted); }); } } @@ -1465,18 +1465,6 @@ export class NavController extends Ion { } } - /** - * @input {boolean} Whether it's possible to swipe-to-go-back on this nav controller or not. - */ - @Input() - get swipeBackEnabled(): boolean { - return this._sbEnabled; - } - - set swipeBackEnabled(val: boolean) { - this._sbEnabled = isTrueProperty(val); - } - /** * If it's possible to use swipe back or not. If it's not possible * to go back, or swipe back is not enable then this will return false. @@ -1572,7 +1560,7 @@ export class NavController extends Ion { * @returns {viewController} */ getPrevious(view: ViewController): ViewController { - return this.getByIndex( this.indexOf(view) - 1 ); + return this.getByIndex(this.indexOf(view) - 1); } /** diff --git a/ionic/components/nav/nav.ts b/ionic/components/nav/nav.ts index c9d948cf1d..86ceb92549 100644 --- a/ionic/components/nav/nav.ts +++ b/ionic/components/nav/nav.ts @@ -3,6 +3,7 @@ import {Component, ElementRef, Input, Optional, NgZone, Compiler, AppViewManager import {IonicApp} from '../app/app'; import {Config} from '../../config/config'; import {Keyboard} from '../../util/keyboard'; +import {isTrueProperty} from '../../util/util'; import {NavController} from './nav-controller'; import {ViewController} from './view-controller'; @@ -42,10 +43,10 @@ import {ViewController} from './view-controller'; * Nav will automatically add a back button to it if there is a page * before the one you are navigating to in the navigation stack. * - * Additionally, specifying the `swipe-back-enabled` property will allow you to + * Additionally, specifying the `swipeBackEnabled` property will allow you to * swipe to go back: * ```html - * + * * ``` * * Here is a diagram of how Nav animates smoothly between pages: @@ -146,6 +147,18 @@ export class Nav extends NavController { } } + /** + * @input {boolean} Whether it's possible to swipe-to-go-back on this nav controller or not. + */ + @Input() + get swipeBackEnabled(): boolean { + return this._sbEnabled; + } + + set swipeBackEnabled(val: boolean) { + this._sbEnabled = isTrueProperty(val); + } + /** * @private */ diff --git a/ionic/components/nav/test/nested/index.ts b/ionic/components/nav/test/nested/index.ts index 80c8c9c26c..5a655efc3b 100644 --- a/ionic/components/nav/test/nested/index.ts +++ b/ionic/components/nav/test/nested/index.ts @@ -44,7 +44,7 @@ export class Login { - + ` }) export class Account { @@ -135,7 +135,7 @@ export class Profile { @App({ - template: `` + template: `` }) class E2EApp { constructor() {