Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix IE 11 #6169

Merged
merged 2 commits into from
Jan 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Change Log
* The clock does not animate by default. Set the `shouldAnimate` option to `true` when creating the Viewer to enable animation.
* Deprecated
* For all classes/functions that can now take a `Resource` instance, all additional parameters that are part of the `Resource` class have been deprecated and will be removed in Cesium 1.44. This generally includes `proxy`, `headers` and `query` parameters.
* Fixed Sandcastle for IE 11. [#6169](https://github.com/AnalyticalGraphicsInc/cesium/pull/6169)
* Major refactor of URL handling. All classes that take a url parameter, can now take a Resource or a String. This includes all imagery providers, all terrain providers, `Cesium3DTileset`, `KMLDataSource`, `CZMLDataSource`, `GeoJsonDataSource`, `Model`, `Billboard`, along with all the low level `load*()` functions.
* Added `ClippingPlaneCollection.isSupported` function for checking if rendering with clipping planes is supported.
* Added new `CesiumIon` utility class for working with the Cesium ion beta API.
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/getTimestamp.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ define([
*/
var getTimestamp;

if (typeof performance !== 'undefined' && defined(performance.now)) {
if (typeof performance !== 'undefined' && typeof performance.now === 'function' && isFinite(performance.now())) {
getTimestamp = function() {
return performance.now();
};
Expand Down