From 41ecfdc4aefcc834983da2f92964f0c89f0d4917 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Tue, 14 Jun 2016 22:27:31 -0500 Subject: [PATCH] style(navigation): fixed sass-lint error, changed function name fixed sass-lint error, changed function name --- src/components/item/item-sliding.scss | 2 +- src/components/nav/nav-controller.ts | 4 ++-- src/components/nav/test/nav-controller.spec.ts | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/item/item-sliding.scss b/src/components/item/item-sliding.scss index 1630fd1c0b..66a6c0689b 100644 --- a/src/components/item/item-sliding.scss +++ b/src/components/item/item-sliding.scss @@ -8,7 +8,7 @@ ion-item-sliding { position: relative; display: block; overflow: hidden; - + width: 100%; .item { diff --git a/src/components/nav/nav-controller.ts b/src/components/nav/nav-controller.ts index dd1a6e18ec..519bfd5d13 100644 --- a/src/components/nav/nav-controller.ts +++ b/src/components/nav/nav-controller.ts @@ -1171,7 +1171,7 @@ export class NavController extends Ion { ev: opts.ev, }; - let transAnimation = this.createTransitionWrapper(enteringView, leavingView, transitionOpts); + let transAnimation = this._createTrans(enteringView, leavingView, transitionOpts); this._trans && this._trans.destroy(); this._trans = transAnimation; @@ -1394,7 +1394,7 @@ export class NavController extends Ion { * to make it easy/possible to mock the method call by overriding the function. * In testing we don't want to actually do the animation, we want to return a stub instead */ - private createTransitionWrapper(enteringView: ViewController, leavingView: ViewController, transitionOpts: any) { + private _createTrans(enteringView: ViewController, leavingView: ViewController, transitionOpts: any) { return Transition.createTransition(enteringView, leavingView, transitionOpts); } diff --git a/src/components/nav/test/nav-controller.spec.ts b/src/components/nav/test/nav-controller.spec.ts index cda4e631d5..fd4ae7fadd 100644 --- a/src/components/nav/test/nav-controller.spec.ts +++ b/src/components/nav/test/nav-controller.spec.ts @@ -1378,7 +1378,7 @@ export function run() { getDuration: () => { return 50}, onFinish: () => {} }; - nav.createTransitionWrapper = () => { + nav._createTrans = () => { return mockTransition; }; nav.config = { @@ -1415,7 +1415,7 @@ export function run() { getDuration: () => { return 200}, onFinish: () => {} }; - nav.createTransitionWrapper = () => { + nav._createTrans = () => { return mockTransition; }; nav.config = { @@ -1455,7 +1455,7 @@ export function run() { getDuration: () => { return 200}, onFinish: () => {} }; - nav.createTransitionWrapper = () => { + nav._createTrans = () => { return mockTransition; }; nav.config = { @@ -1495,7 +1495,7 @@ export function run() { getDuration: () => { return 200}, onFinish: () => {} }; - nav.createTransitionWrapper = () => { + nav._createTrans = () => { return mockTransition; }; nav.config = {