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

added cartesian defined control, changes.md updated #5759

Merged
merged 5 commits into from
Aug 24, 2017

Conversation

esraerik
Copy link
Contributor

#5703 In 3D Tiles Interactivity sandcastle added cartesian is defined control. So prevent developer error caused in annotate example.

@pjcozzi pjcozzi requested a review from ggetz August 19, 2017 17:54
@pjcozzi
Copy link
Contributor

pjcozzi commented Aug 19, 2017

Thanks for the fix, @esraerik!

@ggetz do you want to review this?

Copy link
Contributor

@ggetz ggetz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks @esraerik! Just those comments.

@@ -45,7 +45,6 @@
'use strict';
//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer');

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the extra whitespace

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ggetz I cannot seen a whitespace ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry, @esraerik, my mistake, I meant remove this extra whitespace change. It's not needed.

CHANGES.md Outdated
@@ -1,5 +1,9 @@
Change Log
==========
### 1.36 - 2017-08-17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be 1.37 - 2017-09-01. It's not a breaking change, so no need to list it as one. Usually we say something like Fixed a bug where developer error was thrown in Sandcastle example [#5703](https://github.com/AnalyticalGraphicsInc/cesium/issues/5703)

@@ -45,7 +45,7 @@
'use strict';
//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer');

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@esraerik This tab shouldn't be here either.

…cartesian-defined-control

# Conflicts:
#	Apps/Sandcastle/gallery/3D Tiles Interactivity.html
@ggetz
Copy link
Contributor

ggetz commented Aug 24, 2017

Thanks @esraerik! This looks good to merge to me! @pjcozzi

@pjcozzi pjcozzi merged commit 80161c3 into CesiumGS:master Aug 24, 2017
@pjcozzi
Copy link
Contributor

pjcozzi commented Aug 24, 2017

Thanks @esraerik @ggetz!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants