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

fix(menu): disable menu swipe while transitioning

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-11-17 17:51:27 +01:00
parent 0883f98b0f
commit 168428e6c0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
import { ChangeDetectionStrategy, Component, ContentChild, ElementRef, EventEmitter, Input, NgZone, Output, Renderer, ViewChild, ViewEncapsulation } from '@angular/core'; import { ChangeDetectionStrategy, Component, ContentChild, ElementRef, EventEmitter, Input, NgZone, Output, Renderer, ViewChild, ViewEncapsulation } from '@angular/core';
import { App } from '../app/app';
import { Backdrop } from '../backdrop/backdrop'; import { Backdrop } from '../backdrop/backdrop';
import { Config } from '../../config/config'; import { Config } from '../../config/config';
import { isTrueProperty, assert } from '../../util/util'; import { isTrueProperty, assert } from '../../util/util';
@ -303,7 +304,8 @@ export class Menu {
private _renderer: Renderer, private _renderer: Renderer,
private _keyboard: Keyboard, private _keyboard: Keyboard,
private _zone: NgZone, private _zone: NgZone,
private _gestureCtrl: GestureController private _gestureCtrl: GestureController,
private _app: App
) { ) {
this._gestureBlocker = _gestureCtrl.createBlocker({ this._gestureBlocker = _gestureCtrl.createBlocker({
disable: [GESTURE_GO_BACK_SWIPE] disable: [GESTURE_GO_BACK_SWIPE]
@ -427,7 +429,10 @@ export class Menu {
* @private * @private
*/ */
canSwipe(): boolean { canSwipe(): boolean {
return this._isEnabled && this._isSwipeEnabled && !this._isAnimating; return this._isEnabled &&
this._isSwipeEnabled &&
!this._isAnimating &&
this._app.isEnabled();
} }
/** /**