javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 05:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(gestures): using new DomController

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-12-02 10:55:46 +01:00
parent 3532a71c29
commit c08c21a4a0
15 changed files with 241 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gestures/drag-gesture.ts
View File

@ -3,7 +3,7 @@ import { GestureDelegate } from '../gestures/gesture-controller';
import { PanRecognizer } from './recognizers';
import { PointerEvents, PointerEventsConfig, UIEventManager } from '../util/ui-event-manager';
import { pointerCoord } from '../util/dom';
import { Debouncer, FakeDebouncer } from '../util/debouncer';
import { DomDebouncer, DomController } from '../util/dom-controller';
/**
* @private
@ -13,7 +13,7 @@ export interface PanGestureConfig {
maxAngle?: number;
direction?: 'x' | 'y';
gesture?: GestureDelegate;
debouncer?: Debouncer;
domController?: DomController;
zone?: boolean;
capture?: boolean;
passive?: boolean;
@ -24,7 +24,7 @@ export interface PanGestureConfig {
*/
export class PanGesture {
private debouncer: Debouncer;
private debouncer: DomDebouncer;
private events: UIEventManager = new UIEventManager(false);
private pointerEvents: PointerEvents;
private detector: PanRecognizer;
@ -44,10 +44,9 @@ export class PanGesture {
capture: false,
passive: false,
});
this.debouncer = (opts.debouncer)
? opts.debouncer
: new FakeDebouncer();
if (opts.domController) {
this.debouncer = opts.domController.debouncer();
}
this.gestute = opts.gesture;
this.direction = opts.direction;
this.eventsConfig = {
@ -124,7 +123,7 @@ export class PanGesture {
pointerMove(ev: any) {
assert(this.started === true, 'started must be true');
if (this.captured) {
this.debouncer.debounce(() => {
this.debouncer.write(() => {
this.onDragMove(ev);
});
return;

4
src/gestures/gesture-controller.ts
View File

@ -120,6 +120,7 @@ export class GestureController {
if (maxPriority === priority) {
this.capturedID = id;
this.requestedStart = {};
console.debug(`${gestureName} captured!`);
return true;
}
delete requestedStart[id];
@ -170,12 +171,13 @@ export class GestureController {
canStart(gestureName: string): boolean {
if (this.capturedID) {
console.debug(`${gestureName} can not start becuse gesture was already captured`);
// a gesture already captured
return false;
}
if (this.isDisabled(gestureName)) {
console.debug('GestureController: Disabled', gestureName);
console.debug(`${gestureName} is disabled`);
return false;
}
return true;