Skip to content
Browse files

Merge remote-tracking branch 'origin/master' into grid-material

  • Loading branch information...
2 parents 6c05660 + 149403c commit eb792e56d99c39ac9df626212afc1221a6e41bfb @emackey emackey committed Apr 1, 2013
View
6 CHANGES.md
@@ -21,9 +21,9 @@ Beta Releases
* Added `sampleTerrain` function to sample the terrain height of a list of `Cartographic` positions.
* Added `DynamicObjectCollection.removeObject` and handling of the new CZML `delete` property.
* Imagery layers with an `alpha` of exactly 0.0 are no longer rendered. Previously these invisible layers were rendered normally, which was a waste of resources. Unlike the `show` property, imagery tiles in a layer with an `alpha` of 0.0 are still downloaded, so the layer will become visible more quickly when its `alpha` is increased.
-* Added 'onTransitionStart` and `onTransitionComplete` events to `SceneModeTransitioner`.
-* Added 'SceneModePicker`; a new widget for morphing between scene modes.
-* Added 'BaseLayerPicker`; a new widget for switching among pre-configured base layer imagery providers.
+* Added `onTransitionStart` and `onTransitionComplete` events to `SceneModeTransitioner`.
+* Added `SceneModePicker`; a new widget for morphing between scene modes.
+* Added `BaseLayerPicker`; a new widget for switching among pre-configured base layer imagery providers.
### b14 - 2013-03-01
View
16 Source/Widgets/BaseLayerPicker/BaseLayerPicker.js
@@ -122,19 +122,19 @@ define(['./BaseLayerPickerViewModel',
this.container = container;
/**
- * Gets the actual button created by this widget.
+ * Gets the element created by this widget.
* @memberof FullscreenWidget
* @type {Element}
*/
- this.button = document.createElement('img');
+ this.element = document.createElement('img');
- var button = this.button;
- button.setAttribute('draggable', 'false');
- button.className = 'cesium-baseLayerPicker-selected';
- button.setAttribute('data-bind', '\
+ var element = this.element;
+ element.setAttribute('draggable', 'false');
+ element.className = 'cesium-baseLayerPicker-selected';
+ element.setAttribute('data-bind', '\
attr: {title: selectedName, src: selectedIconUrl},\
click: toggleDropDown');
- container.appendChild(button);
+ container.appendChild(element);
var choices = document.createElement('div');
choices.className = 'cesium-baseLayerPicker-dropDown';
@@ -186,7 +186,7 @@ define(['./BaseLayerPickerViewModel',
document.removeEventListener('touchstart', this._closeDropDown);
var container = this.container;
knockout.cleanNode(container);
- container.removeChild(this.button);
+ container.removeChild(this.element);
return destroyObject(this);
};
View
4 Source/Widgets/CesiumWidget/CesiumWidget.js
@@ -155,7 +155,7 @@ define(['../../Core/buildModuleUrl',
* @memberof CesiumWidget
* @type {Element}
*/
- this.widgetNode = widgetNode;
+ this.element = widgetNode;
/**
* Gets the canvas.
@@ -235,7 +235,7 @@ define(['../../Core/buildModuleUrl',
*/
CesiumWidget.prototype.destroy = function() {
window.removeEventListener('resize', this._resizeCallback, false);
- this.container.removeChild(this.widgetNode);
+ this.container.removeChild(this.element);
this._isDestroyed = true;
destroyObject(this);
};
View
4 Source/Widgets/Fullscreen/FullscreenWidget.css
@@ -1,7 +1,7 @@
.cesium-fullscreen {
border: solid 1px #888;
background-color: #222;
- background-image: url(../Images/enterFullscreen-darker.svg);
+ background-image: url(../Images/enterFullscreen.svg);
background-size: 100% 100%;
width: 100%;
height: 100%;
@@ -14,5 +14,5 @@
}
.cesium-fullscreen-exit {
- background-image: url(../Images/exitFullscreen-darker.svg);
+ background-image: url(../Images/exitFullscreen.svg);
}
View
14 Source/Widgets/Fullscreen/FullscreenWidget.js
@@ -59,16 +59,16 @@ define(['./FullscreenViewModel',
this.container = container;
/**
- * Gets the actual button created by this widget.
+ * Gets the element created by this widget.
* @memberof FullscreenWidget
* @type {Element}
*/
- this.button = document.createElement('button');
- this.button.className = 'cesium-fullscreen';
- this.button.setAttribute('data-bind', 'attr: { title: tooltip }, css: { "fullscreen-exit": toggled }, click: command, enable: isFullscreenEnabled');
- container.appendChild(this.button);
+ this.element = document.createElement('button');
+ this.element.className = 'cesium-fullscreen';
+ this.element.setAttribute('data-bind', 'attr: { title: tooltip }, css: { "cesium-fullscreen-exit": toggled }, click: command, enable: isFullscreenEnabled');
+ container.appendChild(this.element);
- knockout.applyBindings(this.viewModel, this.button);
+ knockout.applyBindings(this.viewModel, this.element);
};
/**
@@ -79,7 +79,7 @@ define(['./FullscreenViewModel',
FullscreenWidget.prototype.destroy = function() {
var container = this.container;
knockout.cleanNode(container);
- container.removeChild(this.button);
+ container.removeChild(this.element);
return destroyObject(this);
};
View
4 Source/Widgets/Fullscreen/lighter.css
@@ -1,13 +1,13 @@
.cesium-lighter .cesium-fullscreen {
border: solid 1px #9BBFDF;
background-color: #DFEFFF;
- background-image: url(../Images/enterFullscreen.svg);
+ background-image: url(../Images/enterFullscreen-lighter.svg);
}
.cesium-lighter .cesium-fullscreen:hover {
background-color: #A9D5FF;
}
.cesium-lighter .cesium-fullscreen-exit {
- background-image: url(../Images/exitFullscreen.svg);
+ background-image: url(../Images/exitFullscreen-lighter.svg);
}
View
2 ...Widgets/Images/enterFullscreen-darker.svg → ...idgets/Images/enterFullscreen-lighter.svg
@@ -9,7 +9,7 @@
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
-
+
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
View
2 Source/Widgets/Images/enterFullscreen.svg
@@ -9,7 +9,7 @@
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
-
+
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
View
2 .../Widgets/Images/exitFullscreen-darker.svg → ...Widgets/Images/exitFullscreen-lighter.svg
@@ -9,7 +9,7 @@
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
-
+
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
View
2 Source/Widgets/Images/exitFullscreen.svg
@@ -9,7 +9,7 @@
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
-
+
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
View
6 Source/Widgets/SceneModePicker/SceneModePicker.js
@@ -75,9 +75,9 @@ define(['./SceneModePickerViewModel',
* @memberof FullscreenWidget
* @type {Element}
*/
- this.button = document.createElement('span');
+ this.element = document.createElement('span');
- var widgetNode = this.button;
+ var widgetNode = this.element;
widgetNode.className = 'cesium-sceneModePicker-button';
widgetNode.setAttribute('data-bind', '\
css: { "cesium-sceneModePicker-button2D": sceneMode() === _sceneMode.SCENE2D,\
@@ -144,7 +144,7 @@ define(['./SceneModePickerViewModel',
document.removeEventListener('touchstart', this._closeDropDown);
var container = this.container;
knockout.cleanNode(container);
- container.removeChild(this.button);
+ container.removeChild(this.element);
container.removeChild(this._node3D);
container.removeChild(this._node2D);
container.removeChild(this._nodeColumbus);
View
16 build.xml
@@ -101,9 +101,14 @@
<!-- properties controlling which steps get run -->
<property name="build.minification" value="false" />
+ <!-- properties controlling how to run the server-->
+ <property name="runServer.public" value="false" />
+ <property name="runServer.port" value="8080" />
+ <property name="runServer.allowedHosts" value="localhost,*.arcgisonline.com,tile.openstreetmap.org,otile1.mqcdn.com,oatile1.mqcdn.com,tile.stamen.com,*.virtualearth.net,mesonet.agron.iastate.edu" />
+
<!-- Inputs -->
<!-- this version should be set to the upcoming version, so it can be tagged without requiring a bump first -->
- <property name="version" value="b14" />
+ <property name="version" value="b15" />
<property name="sourceDirectory" location="Source" />
<property name="shadersDirectory" location="${sourceDirectory}/Shaders" />
<property name="examplesDirectory" location="Examples" />
@@ -333,9 +338,14 @@
upstreamProxyHost: a standard proxy server that the local server will use to retrieve data
upstreamProxyPort: the port number of the upstream proxy, default 80
noUpstreamProxyHostList: A comma-separated list of hosts that will not use the upstreamProxy
- listenOnAllAddresses: Set to true if you want the server to listen to all addresses, not just localhost.
-->
- <server proxyContextPath="/proxy" terrainTranscodingContextPath="/terrain" allowedHostList="localhost,*.arcgisonline.com,tile.openstreetmap.org,otile1.mqcdn.com,oatile1.mqcdn.com,tile.stamen.com,*.virtualearth.net,mesonet.agron.iastate.edu" port="8080" baseDir="${basedir}" />
+ <server listenOnAllAddresses="${runServer.public}" allowedHostList="${runServer.allowedHosts}" port="${runServer.port}" baseDir="${basedir}" proxyContextPath="/proxy" terrainTranscodingContextPath="/terrain" />
+ </target>
+
+ <target name="runPublicServer" description="Runs a public web server">
+ <antcall target="runServer">
+ <param name="runServer.public" value="true" />
+ </antcall>
</target>
<target name="buildApps" description="Create built versions of all example applications.">

0 comments on commit eb792e5

Please sign in to comment.
Something went wrong with that request. Please try again.