From 4f52184ef7cc7d6703e145b3afdc5f6b14b93cb1 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Fri, 9 Sep 2016 11:40:52 -0400 Subject: [PATCH 1/2] fix timeline touch --- Source/Widgets/Timeline/Timeline.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Widgets/Timeline/Timeline.js b/Source/Widgets/Timeline/Timeline.js index 32eef7c42fca..4521a69d65a4 100644 --- a/Source/Widgets/Timeline/Timeline.js +++ b/Source/Widgets/Timeline/Timeline.js @@ -702,9 +702,9 @@ define([ var len = e.touches.length, leftX = timeline._topDiv.getBoundingClientRect().left; if (timeline._touchMode === timelineTouchMode.singleTap) { timeline._touchMode = timelineTouchMode.scrub; - timeline._handleTouchMove(e); + timeline._onTouchMove(e); } else if (timeline._touchMode === timelineTouchMode.scrub) { - timeline._handleTouchMove(e); + timeline._onTouchMove(e); } timeline._mouseMode = timelineMouseMode.touchOnly; if (len !== 1) { @@ -790,4 +790,4 @@ define([ }; return Timeline; -}); +}); \ No newline at end of file From d324e149fbd3472f167c0716d8c1d3f9aea5573f Mon Sep 17 00:00:00 2001 From: Hannah Date: Mon, 12 Sep 2016 11:28:55 -0400 Subject: [PATCH 2/2] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 96bdf204acb0..c796e5d85259 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ Change Log * Fixed billboard rotation when sized in meters. [#3979](https://github.com/AnalyticalGraphicsInc/cesium/issues/3979) * Added `DebugCameraPrimitive` to visualize the view frustum of a camera. +* Fixed touch events for the timeline [#4305](https://github.com/AnalyticalGraphicsInc/cesium/pull/4305) ### 1.25 - 2016-09-01