javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 21:48:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(animation): improve menu and go back swipe

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-11-21 23:09:57 +01:00
parent 3b304974ec
commit 4be47bd3dd
8 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/menu/menu.ts
View File

@ -465,7 +465,7 @@ export class Menu {
/**
* @private
*/
swipeEnd(shouldCompleteLeft: boolean, shouldCompleteRight: boolean, stepValue: number) {
swipeEnd(shouldCompleteLeft: boolean, shouldCompleteRight: boolean, stepValue: number, velocity: number) {
if (!this._isAnimating) {
return;
}
@ -478,7 +478,7 @@ export class Menu {
shouldComplete = (this.side === 'right') ? shouldCompleteRight : shouldCompleteLeft;
}
this._getType().setProgressEnd(shouldComplete, stepValue, (isOpen: boolean) => {
this._getType().setProgressEnd(shouldComplete, stepValue, velocity, (isOpen: boolean) => {
console.debug('menu, swipeEnd', this.side);
this._after(isOpen);
});
@ -512,14 +512,9 @@ export class Menu {
this._cntEle.classList.add('menu-content-open');
let callback = this.onBackdropClick.bind(this);
this._events.pointerEvents({
element: this._cntEle,
pointerDown: callback
});
this._events.pointerEvents({
element: this.backdrop.getNativeElement(),
pointerDown: callback
});
this._events.listen(this._cntEle, 'click', callback, true);
this._events.listen(this.backdrop.getNativeElement(), 'click', callback, true);
this.ionOpen.emit(true);
} else {