From 3a2ffa8362a2d91ffb2ac9851686fb9f6b17ad95 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 22 Sep 2015 16:08:27 -0500 Subject: [PATCH] chore(): rename progressFinish to progressEnd --- ionic/animations/animation.ts | 4 ++-- ionic/components/menu/menu-gestures.ts | 2 +- ionic/components/menu/menu-types.ts | 4 ++-- ionic/components/menu/menu.ts | 4 ++-- ionic/components/view/swipe-back.ts | 2 +- ionic/components/view/view-controller.ts | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ionic/animations/animation.ts b/ionic/animations/animation.ts index da31b167a8..6525b7083b 100644 --- a/ionic/animations/animation.ts +++ b/ionic/animations/animation.ts @@ -406,12 +406,12 @@ export class Animation { } } - progressFinish(shouldComplete, rate=3) { + progressEnd(shouldComplete, rate=3) { let promises = []; this.isProgress = false; for (let i = 0; i < this._chld.length; i++) { - promises.push( this._chld[i].progressFinish(shouldComplete) ); + promises.push( this._chld[i].progressEnd(shouldComplete) ); } this._ani.forEach(animation => { diff --git a/ionic/components/menu/menu-gestures.ts b/ionic/components/menu/menu-gestures.ts index e2b629c56a..b13f562ffd 100644 --- a/ionic/components/menu/menu-gestures.ts +++ b/ionic/components/menu/menu-gestures.ts @@ -30,7 +30,7 @@ class MenuContentGesture extends SlideEdgeGesture { onSlideEnd(slide, ev) { let shouldComplete = (Math.abs(ev.velocityX) > 0.2 || Math.abs(slide.delta) > Math.abs(slide.max) * 0.5); - this.menu.setProgressFinish(shouldComplete); + this.menu.setProgressEnd(shouldComplete); } getElementStartPos(slide, ev) { diff --git a/ionic/components/menu/menu-types.ts b/ionic/components/menu/menu-types.ts index 0666a38d12..97dd54fff4 100644 --- a/ionic/components/menu/menu-types.ts +++ b/ionic/components/menu/menu-types.ts @@ -49,7 +49,7 @@ export class MenuType { this.seek.progress(value); } - setProgressFinish(shouldComplete) { + setProgressEnd(shouldComplete) { let resolve; let promise = new Promise(res => { resolve = res }); @@ -58,7 +58,7 @@ export class MenuType { isOpen = true; } - this.seek.progressFinish(shouldComplete).then(() => { + this.seek.progressEnd(shouldComplete).then(() => { this.isOpening = false; resolve(isOpen); }); diff --git a/ionic/components/menu/menu.ts b/ionic/components/menu/menu.ts index 0043cdfa55..c2ab5a3a1e 100644 --- a/ionic/components/menu/menu.ts +++ b/ionic/components/menu/menu.ts @@ -140,11 +140,11 @@ export class Menu extends Ion { this._type.setProgess(value); } - setProgressFinish(shouldComplete) { + setProgressEnd(shouldComplete) { // user has finished dragging the menu this._disable(); this.app.setEnabled(false); - this._type.setProgressFinish(shouldComplete).then(isOpen => { + this._type.setProgressEnd(shouldComplete).then(isOpen => { this._after(isOpen); }); } diff --git a/ionic/components/view/swipe-back.ts b/ionic/components/view/swipe-back.ts index a4c5372708..a10a96622e 100644 --- a/ionic/components/view/swipe-back.ts +++ b/ionic/components/view/swipe-back.ts @@ -23,7 +23,7 @@ export class SwipeBackGesture extends SlideEdgeGesture { let shouldComplete = (Math.abs(ev.velocityX) > 0.2 || Math.abs(slide.delta) > Math.abs(slide.max) * 0.5); // TODO: calculate a better playback rate depending on velocity and distance - this.viewCtrl.swipeBackFinish(shouldComplete, 1); + this.viewCtrl.swipeBackEnd(shouldComplete, 1); } } diff --git a/ionic/components/view/view-controller.ts b/ionic/components/view/view-controller.ts index 639e46099a..f68ffa257d 100644 --- a/ionic/components/view/view-controller.ts +++ b/ionic/components/view/view-controller.ts @@ -377,13 +377,13 @@ export class ViewController extends Ion { * @param {TODO} completeSwipeBack Should the swipe back complete or not. * @param {number} rate How fast it closes */ - swipeBackFinish(completeSwipeBack, rate) { + swipeBackEnd(completeSwipeBack, rate) { if (!this._sbTrans) return; // disables the app during the transition this.app.setEnabled(false); - this._sbTrans.progressFinish(completeSwipeBack, rate).then(() => { + this._sbTrans.progressEnd(completeSwipeBack, rate).then(() => { this.zone.run(() => { // find the items that were entering and leaving