Merge pull request #3592 from milkisevil/master

`srcEvent` now uses a union type (as introduced with Typescript 1.4)
This commit is contained in:
Masahiro Wakame
2015-02-04 22:42:00 +09:00
+3 -1
View File
@@ -3,6 +3,8 @@
// Definitions by: Philip Bulley <https://github.com/milkisevil/>, Han Lin Yap <https://github.com/codler>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
/// <reference path="../touch-events/touch-events.d.ts" />
declare var Hammer:HammerStatic;
declare module "Hammer" {
@@ -167,7 +169,7 @@ declare class HammerInput
center:HammerPoint;
/** Source event object, type TouchEvent, MouseEvent or PointerEvent. */
srcEvent:Event; // TODO: Update to Union Type (TouchEvent | MouseEvent | PointerEvent) if it lands in TS1.4
srcEvent:TouchEvent | MouseEvent | PointerEvent;
/** Target that received the event. */
target:HTMLElement;