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

Fix gestures support for iOS 10

Browse Source
This commit is contained in:
Hristo Hristov
2016-10-11 13:28:02 +03:00
parent 4cf8a1574c
commit b5ec25f423
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tns-core-modules/ui/gestures/gestures.ios.ts
View File

@ -4,6 +4,8 @@ import view = require("ui/core/view");
import observable = require("data/observable"); import observable = require("data/observable");
import trace = require("trace"); import trace = require("trace");
import types = require("utils/types"); import types = require("utils/types");
import utils = require("utils/utils");
import getter = utils.ios.getter;
global.moduleMerge(common, exports); global.moduleMerge(common, exports);
@ -413,14 +415,14 @@ class TouchGestureEventData implements definition.TouchGestureEventData {
android: any = undefined; android: any = undefined;
action: string; action: string;
view: view.View; view: view.View;
ios: { touches: NSSet<any>, event: { allTouches: () => NSSet<any> } }; ios: { touches: NSSet<any>, event: UIEvent };
object: any; object: any;
private _activePointers: Array<Pointer>; private _activePointers: Array<Pointer>;
private _allPointers: Array<Pointer>; private _allPointers: Array<Pointer>;
private _mainPointer: UITouch; private _mainPointer: UITouch;
public prepare(view: view.View, action: string, touches: NSSet<any>, event: any) { public prepare(view: view.View, action: string, touches: NSSet<any>, event: UIEvent) {
this.action = action; this.action = action;
this.view = view; this.view = view;
this.object = view; this.object = view;
@ -435,7 +437,7 @@ class TouchGestureEventData implements definition.TouchGestureEventData {
} }
getPointerCount(): number { getPointerCount(): number {
return this.ios.event.allTouches().count; return getter(this.ios.event, this.ios.event.allTouches).count;
} }
private getMainPointer(): UITouch { private getMainPointer(): UITouch {
@ -461,7 +463,7 @@ class TouchGestureEventData implements definition.TouchGestureEventData {
if (!this._allPointers) { if (!this._allPointers) {
this._allPointers = []; this._allPointers = [];
let nsArr = this.ios.event.allTouches().allObjects; let nsArr = getter(this.ios.event, this.ios.event.allTouches).allObjects;
for (var i = 0; i < nsArr.count; i++) { for (var i = 0; i < nsArr.count; i++) {
this._allPointers.push(new Pointer(nsArr.objectAtIndex(i), this.view)); this._allPointers.push(new Pointer(nsArr.objectAtIndex(i), this.view));
} }