javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #657 from NativeScript/mulitple-gestures-android

Browse Source 
Fixed multiple gestures for Android
This commit is contained in:
Vladimir Enchev
2015-09-02 09:49:23 +03:00
parent 8244827d19 bc4ebd569c
commit 490cd88a0f
5 changed files with 23 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ui/core/view-common.ts
View File

@ -142,14 +142,10 @@ export class View extends proxy.ProxyObject implements definition.View {
public _cssClasses: Array<string> = [];
public _gestureObservers: Map<number, Array<gestures.GesturesObserver>>;
public _gestureObservers = {};
public getGestureObservers(type: gestures.GestureTypes): Array<gestures.GesturesObserver> {
var result;
if (this._gestureObservers) {
result = this._gestureObservers.get(type) ? this._gestureObservers.get(type).slice(0) : undefined;
}
return result;
return this._gestureObservers[type];
}
private _updatingInheritedProperties: boolean;
@ -167,29 +163,11 @@ export class View extends proxy.ProxyObject implements definition.View {
}
observe(type: gestures.GestureTypes, callback: (args: gestures.GestureEventData) => void, thisArg?: any): void {
var gesturesList = this._getGesturesList(type, true);
gesturesList.push(gestures.observe(this, type, callback, thisArg));
}
if (!this._gestureObservers[type]) {
this._gestureObservers[type] = [];
}
private _getGesturesList(gestureType: number, createIfNeeded): Array<gestures.GesturesObserver> {
if (!gestureType) {
throw new Error("GestureType must be a valid gesture!");
}
var list: Array<gestures.GesturesObserver>;
if (this._gestureObservers && this._gestureObservers.has(gestureType)) {
list = this._gestureObservers.get(gestureType);
}
else {
if (createIfNeeded) {
list = [];
if (!this._gestureObservers) {
this._gestureObservers = new Map<number, Array<gestures.GesturesObserver>>();
}
this._gestureObservers.set(gestureType, list);
}
}
return list;
this._gestureObservers[type].push(gestures.observe(this, type, callback, thisArg));
}
public addEventListener(arg: string | gestures.GestureTypes, callback: (data: observable.EventData) => void, thisArg?: any) {

17
ui/core/view.android.ts
View File

@ -97,7 +97,7 @@ export class View extends viewCommon.View {
}
private hasGestureObservers() {
return this._gestureObservers ? this._gestureObservers.size > 0 : false;
return this._gestureObservers && Object.keys(this._gestureObservers).length > 0
}
private setOnTouchListener() {
@ -114,18 +114,13 @@ export class View extends viewCommon.View {
return false;
}
var i;
for (var gestType in gestures.GestureTypes) {
if (gestures.GestureTypes.hasOwnProperty(gestType) && typeof gestures.GestureTypes[gestType] === "number") {
var gestArray = owner.getGestureObservers(parseInt(gestures.GestureTypes[gestType]));
if (gestArray) {
for (i = 0; i < gestArray.length; i++) {
var gestObserver = gestArray[i];
gestObserver.androidOnTouchEvent(motionEvent);
}
}
for (let type in owner._gestureObservers) {
let list = owner._gestureObservers[type];
for (let i = 0; i < list.length; i++) {
list[i].androidOnTouchEvent(motionEvent);
}
}
return owner._nativeView.onTouchEvent(motionEvent);
}
}));

2
ui/core/view.d.ts vendored
View File

@ -416,7 +416,7 @@ declare module "ui/core/view" {
// TODO: Implement logic for stripping these lines out
//@private
_gestureObservers: Map<number, Array<gestures.GesturesObserver>>;
_gestureObservers: any;
_isInheritedChange(): boolean;
_domId: number;
_cssClasses: Array<string>;

15
ui/gestures/gestures-common.ts
View File

@ -126,18 +126,15 @@ export class GesturesObserver implements definition.GesturesObserver {
public disconnect() {
// remove gesture observer from map
if (this.target) {
var gestureObserversArray = this.target._gestureObservers.get(this.type);
if (gestureObserversArray) {
var i;
for (i = 0; i < gestureObserversArray.length; i++) {
if (gestureObserversArray[i].callback === this.callback) {
var list = this.target.getGestureObservers(this.type);
if (list && list.length > 0) {
for (let i = 0; i < list.length; i++) {
if (list[i].callback === this.callback) {
break;
}
}
gestureObserversArray.splice(i, 1);
if (gestureObserversArray.length === 0) {
this.target._gestureObservers.delete(this.type);
}
list.length = 0;
this.target._gestureObservers.delete(this.type);
}
}
this._target = null;

9
ui/gestures/gestures.android.ts
View File

@ -185,7 +185,7 @@ class TapAndDoubleTapGestureListener extends android.view.GestureDetector.Simple
}
public onSingleTapConfirmed(motionEvent: android.view.MotionEvent): boolean {
if (this._type === definition.GestureTypes.tap) {
if (this._type & definition.GestureTypes.tap) {
var args = _getArgs(definition.GestureTypes.tap, this._target, motionEvent);
_executeCallback(this._observer, args);
}
@ -193,7 +193,7 @@ class TapAndDoubleTapGestureListener extends android.view.GestureDetector.Simple
}
public onDoubleTap(motionEvent: android.view.MotionEvent): boolean {
if (this._type === definition.GestureTypes.doubleTap) {
if (this._type & definition.GestureTypes.doubleTap) {
var args = _getArgs(definition.GestureTypes.doubleTap, this._target, motionEvent);
_executeCallback(this._observer, args);
}
@ -204,12 +204,11 @@ class TapAndDoubleTapGestureListener extends android.view.GestureDetector.Simple
return true;
}
public onLongPress(motionEvent: android.view.MotionEvent): boolean {
if (this._type === definition.GestureTypes.longPress) {
public onLongPress(motionEvent: android.view.MotionEvent): void {
if (this._type & definition.GestureTypes.longPress) {
var args = _getArgs(definition.GestureTypes.longPress, this._target, motionEvent);
_executeCallback(this._observer, args);
}
return true;
}
}