From 8dd66735abe6be1dfcf509d64200330b37ea7813 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Sat, 22 Oct 2016 18:13:24 +0200 Subject: [PATCH] refactor(menu): gestureCtrl is a private property of menu --- src/components/menu/menu-gestures.ts | 10 +++++++--- src/components/menu/menu.ts | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/menu/menu-gestures.ts b/src/components/menu/menu-gestures.ts index 4550d47ddd..ee5b8b1775 100644 --- a/src/components/menu/menu-gestures.ts +++ b/src/components/menu/menu-gestures.ts @@ -2,21 +2,25 @@ import { Menu } from './menu'; import { SlideEdgeGesture } from '../../gestures/slide-edge-gesture'; import { SlideData } from '../../gestures/slide-gesture'; import { assign } from '../../util/util'; -import { GesturePriority } from '../../gestures/gesture-controller'; +import { GestureController, GesturePriority } from '../../gestures/gesture-controller'; /** * Gesture attached to the content which the menu is assigned to */ export class MenuContentGesture extends SlideEdgeGesture { - constructor(public menu: Menu, contentEle: HTMLElement, options: any = {}) { + constructor( + public menu: Menu, + gestureCtrl: GestureController, + contentEle: HTMLElement, + options: any = {}) { super(contentEle, assign({ direction: 'x', edge: menu.side, threshold: 0, maxEdgeStart: menu.maxEdgeStart || 50, maxAngle: 40, - gesture: menu.gestureCtrl.create('menu-swipe', { + gesture: gestureCtrl.create('menu-swipe', { priority: GesturePriority.MenuSwipe, }) }, options)); diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts index 865b2d1821..2c620f6b2d 100644 --- a/src/components/menu/menu.ts +++ b/src/components/menu/menu.ts @@ -303,7 +303,7 @@ export class Menu { private _renderer: Renderer, private _keyboard: Keyboard, private _zone: NgZone, - public gestureCtrl: GestureController + private _gestureCtrl: GestureController ) {} /** @@ -333,7 +333,7 @@ export class Menu { this.setElementAttribute('type', this.type); // add the gestures - this._cntGesture = new MenuContentGesture(this, document.body); + this._cntGesture = new MenuContentGesture(this, this._gestureCtrl, document.body); // register listeners if this menu is enabled // check if more than one menu is on the same side