From 8aeeb4d6a06e4c3cb3e480bbad3f55f83b78a626 Mon Sep 17 00:00:00 2001 From: Andrei Coman Date: Wed, 7 Sep 2016 06:14:36 -0700 Subject: [PATCH] Rename native event `timeStamp` to `timestamp` Summary: It's called `timestamp` on iOS, making it consistent. Reviewed By: foghina Differential Revision: D3820937 fbshipit-source-id: 2805f1fc10d6445d8b31676e0e3dca348510ffe7 --- .../com/facebook/react/uimanager/events/TouchesHelper.java | 3 +-- .../src/test/java/com/facebook/react/RootViewTest.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java index acf6f9626..43a12b073 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/TouchesHelper.java @@ -24,7 +24,7 @@ import com.facebook.react.uimanager.PixelUtil; private static final String PAGE_X_KEY = "pageX"; private static final String PAGE_Y_KEY = "pageY"; private static final String TARGET_KEY = "target"; - private static final String TIMESTAMP_KEY = "timeStamp"; + private static final String TIMESTAMP_KEY = "timestamp"; private static final String POINTER_IDENTIFIER_KEY = "identifier"; private static final String LOCATION_X_KEY = "locationX"; @@ -106,5 +106,4 @@ import com.facebook.react.uimanager.PixelUtil; pointers, changedIndices); } - } diff --git a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java index 05d679a20..3bcdab6ac 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java +++ b/ReactAndroid/src/test/java/com/facebook/react/RootViewTest.java @@ -149,7 +149,7 @@ public class RootViewTest { 0., "target", rootViewId, - "timeStamp", + "timestamp", (double) ts, "identifier", 0.)); @@ -186,7 +186,7 @@ public class RootViewTest { 0., "target", rootViewId, - "timeStamp", + "timestamp", (double) ts, "identifier", 0.));