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

fix(menu): fix swipe to go back and left menu conflict

Browse Source 
Closes #5575
This commit is contained in:
Adam Bradley
2016-05-19 23:11:36 -05:00
parent b742e1f0da
commit f18a62485d
7 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/nav/nav-controller.ts
View File

@ -6,6 +6,7 @@ import {IonicApp} from '../app/app';
import {Keyboard} from '../../util/keyboard';
import {NavParams} from './nav-params';
import {pascalCaseToDashCase, isBlank} from '../../util/util';
import {MenuController} from '../menu/menu-controller';
import {NavPortal} from './nav-portal';
import {SwipeBackGesture} from './swipe-back';
import {Transition} from '../../transitions/transition';
@ -1555,7 +1556,8 @@ export class NavController extends Ion {
edge: 'left',
threshold: this._sbThreshold
};
this._sbGesture = new SwipeBackGesture(this.getNativeElement(), opts, this);
let menuCtrl = this._app.getAppInjector().get(MenuController);
this._sbGesture = new SwipeBackGesture(this.getNativeElement(), opts, this, menuCtrl);
}
if (this.canSwipeBack()) {