diff --git a/ionic/components/menu/menu-gestures.ts b/ionic/components/menu/menu-gestures.ts index cad46533bb..b8ae988f64 100644 --- a/ionic/components/menu/menu-gestures.ts +++ b/ionic/components/menu/menu-gestures.ts @@ -70,7 +70,7 @@ export class MenuContentGesture extends SlideEdgeGesture { // Set CSS, then wait one frame for it to apply before sliding starts onSlideBeforeStart(slide, ev) { console.debug('menu gesture, onSlideBeforeStart', this.menu.side); - this.menu.setProgressStart(); + this.menu.swipeStart(); } onSlide(slide, ev) { @@ -78,7 +78,7 @@ export class MenuContentGesture extends SlideEdgeGesture { let stepValue = (slide.distance / z); console.debug('menu gesture, onSlide', this.menu.side, 'distance', slide.distance, 'min', slide.min, 'max', slide.max, 'z', z, 'stepValue', stepValue); - this.menu.setProgessStep(stepValue); + this.menu.swipeProgress(stepValue); } onSlideEnd(slide, ev) { @@ -91,7 +91,7 @@ export class MenuContentGesture extends SlideEdgeGesture { console.debug('menu gesture, onSlide', this.menu.side, 'distance', slide.distance, 'delta', slide.delta, 'velocityX', ev.velocityX, 'min', slide.min, 'max', slide.max, 'shouldComplete', shouldComplete, 'currentStepValue', currentStepValue); - this.menu.setProgressEnd(shouldComplete, currentStepValue); + this.menu.swipeEnd(shouldComplete, currentStepValue); } getElementStartPos(slide, ev) { diff --git a/ionic/components/menu/menu.ts b/ionic/components/menu/menu.ts index ac6331892b..387a44bb17 100644 --- a/ionic/components/menu/menu.ts +++ b/ionic/components/menu/menu.ts @@ -256,7 +256,7 @@ export class Menu extends Ion { /** * @private */ - setProgressStart() { + swipeStart() { // user started swiping the menu open/close if (this._isPrevented() || !this._isEnabled || !this._isSwipeEnabled) return; @@ -267,7 +267,7 @@ export class Menu extends Ion { /** * @private */ - setProgessStep(stepValue: number) { + swipeProgress(stepValue: number) { // user actively dragging the menu if (this._isEnabled && this._isSwipeEnabled) { this._prevent(); @@ -279,12 +279,12 @@ export class Menu extends Ion { /** * @private */ - setProgressEnd(shouldComplete: boolean, currentStepValue: number) { + swipeEnd(shouldComplete: boolean, currentStepValue: number) { // user has finished dragging the menu if (this._isEnabled && this._isSwipeEnabled) { this._prevent(); this._getType().setProgressEnd(shouldComplete, currentStepValue, (isOpen) => { - console.debug('menu, progress end', this.side); + console.debug('menu, swipeEnd', this.side); this._after(isOpen); }); }