Skip to content

Commit

Permalink
Merge pull request #4305 from AnalyticalGraphicsInc/fix-timeline-touch
Browse files Browse the repository at this point in the history
Fix timeline touch
  • Loading branch information
lilleyse committed Sep 15, 2016
2 parents a81f2e7 + d324e14 commit 3e530c7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Source/Widgets/Timeline/Timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -790,4 +790,4 @@ define([
};

return Timeline;
});
});

0 comments on commit 3e530c7

Please sign in to comment.