Merge pull request #26 from martinsik/master

BTMorton · BTMorton · commit 67b7e6f36789 · 2015-09-04T18:58:06.000+01:00
Fixed touch event detection
diff --git a/src/NgGrid.ts b/src/NgGrid.ts
@@ -819,9 +819,8 @@ export class NgGrid {
 	}
 	
 	private _getMousePosition(e: any): {left: number, top: number} {
-		if (e.originalEvent && e.originalEvent.touches) {
-			var oe = e.originalEvent;
-			e = oe.touches.length ? oe.touches[0] : oe.changedTouches[0];
+		if (e instanceof TouchEvent) {
+			e = e.touches.length > 0 ? e.touches[0] : e.changedTouches[0];
 		}
 		
 		var refPos = this._ngEl.nativeElement.getBoundingClientRect();

Original file line number	Diff line number	Diff line change
`@@ -819,9 +819,8 @@ export class NgGrid {`
`819`	`819`	`}`
`820`	`820`
`821`	`821`	`private _getMousePosition(e: any): {left: number, top: number} {`
`822`		`- if (e.originalEvent && e.originalEvent.touches) {`
`823`		`- var oe = e.originalEvent;`
`824`		`- e = oe.touches.length ? oe.touches[0] : oe.changedTouches[0];`
	`822`	`+ if (e instanceof TouchEvent) {`
	`823`	`+ e = e.touches.length > 0 ? e.touches[0] : e.changedTouches[0];`
`825`	`824`	`}`
`826`	`825`
`827`	`826`	`var refPos = this._ngEl.nativeElement.getBoundingClientRect();`