Move non-app code out of the Apps directory and create two new directories under source. Dojo, for dojo dependant code, and Controls, for non-toolkit specific ui controls.

2012-05-30 10:27:28 -04:00 · 2012-05-30 10:27:28 -04:00 · 28b0bd3738
parent b0cadc0fe1
commit 28b0bd3738
30 changed files with 51 additions and 75 deletions
--- a/Apps/CesiumViewer/CesiumViewer.css
+++ b/Apps/CesiumViewer/CesiumViewer.css
@ -1,4 +1,4 @@
-@import url('../Dojo/Widgets/TimelineWidget.css');
+@import url('../../Source/Dojo/TimelineWidget.css');

 html,body {
 	height: 100%;
@ -19,9 +19,9 @@ html,body {
 }

 .timelineContainer {
-    position:absolute;
-    bottom:0;
-    width:100%;
-    height: 25px;
-    padding: 0 2px 2px;
-}
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	height: 25px;
+	padding: 0 2px 2px;
+}
--- a/Apps/CesiumViewer/CesiumViewer.js
+++ b/Apps/CesiumViewer/CesiumViewer.js
@ -4,7 +4,8 @@ define(['dojo/dom',
        'dojo/_base/event',
        'dojo/io-query',
        'dijit/registry',
-        'DojoWidgets/CesiumWidget',
+        'CesiumDojo/CesiumWidget',
+        'CesiumDojo/loadCzmlFromUrl',
        'Core/DefaultProxy',
        'Core/JulianDate',
        'Core/Clock',
@ -26,14 +27,14 @@ define(['dojo/dom',
        'DynamicScene/DynamicPolygonVisualizer',
        'DynamicScene/DynamicPolylineVisualizer',
        'DynamicScene/DynamicPyramidVisualizer',
-        'DynamicScene/VisualizerCollection',
-        'CesiumViewer/loadCzmlFromUrl'],
+        'DynamicScene/VisualizerCollection'],
 function(dom,
         on,
         event,
         ioQuery,
         registry,
         CesiumWidget,
+         loadCzmlFromUrl,
         DefaultProxy,
         JulianDate,
         Clock,
@ -55,8 +56,7 @@ function(dom,
         DynamicPolygonVisualizer,
         DynamicPolylineVisualizer,
         DynamicPyramidVisualizer,
-         VisualizerCollection,
-         loadCzmlFromUrl) {
+         VisualizerCollection) {
    "use strict";
    /*global console*/

--- a/Apps/CesiumViewer/boot.js
+++ b/Apps/CesiumViewer/boot.js
@ -13,6 +13,12 @@ require({
    }, {
        name : 'Core',
        location : 'Source/Core'
+    }, {
+        name : 'Controls',
+        location : 'Source/Controls'
+    }, {
+        name : 'CesiumDojo',
+        location : 'Source/Dojo'
    }, {
        name : 'DynamicScene',
        location : 'Source/DynamicScene'
@ -25,18 +31,9 @@ require({
    }, {
        name : 'Shaders',
        location : 'Source/Shaders'
-    }, {
-        name : 'Timeline',
-        location : 'Source/Timeline'
    }, {
        name : 'ThirdParty',
        location : 'Source/ThirdParty'
-    }, {
-        name : 'DojoWidgets',
-        location : 'Apps/Dojo/Widgets'
-    }, {
-        name : 'DojoUtilities',
-        location : 'Apps/Dojo/Utilities'
    }, {
        name : 'CesiumViewer',
        location : 'Apps/CesiumViewer'
@ -45,7 +42,7 @@ require({
    'dojo/parser',
    'dojo/dom-class',
    'dojo/_base/window',
-    'DojoWidgets/TimelineWidget',
+    'CesiumDojo/TimelineWidget',
    'CesiumViewer/CesiumViewer',
    'dojo/domReady!'
 ], function(
--- a/Apps/CesiumViewer/index.html
+++ b/Apps/CesiumViewer/index.html
@ -20,7 +20,7 @@
    <body>
        <div id="cesiumContainer"></div>
        <div class="timelineContainer">
-            <div id="mainTimeline" data-dojo-type="DojoWidgets.TimelineWidget">
+            <div id="mainTimeline" data-dojo-type="CesiumDojo.TimelineWidget">
            </div>
        </div>        
    </body>
--- a/Apps/TimelineDemo/TimelineDemo.js
+++ b/Apps/TimelineDemo/TimelineDemo.js
@ -2,14 +2,14 @@
 define(['dojo',
        'dijit/dijit',
        'Core/Clock',
-        'Timeline/Timeline',
-        'Core/JulianDate'
+        'Core/JulianDate',
+        'Controls/Timeline'
    ], function(
         dojo,
         dijit,
         Clock,
-         Timeline,
-         JulianDate) {
+         JulianDate,
+         Timeline) {
    "use strict";

    var startDatePart, endDatePart, startTimePart, endTimePart;
--- a/Apps/TimelineDemo/boot.js
+++ b/Apps/TimelineDemo/boot.js
@ -14,29 +14,8 @@ require({
        name : 'Core',
        location : 'Source/Core'
    }, {
-        name : 'DynamicScene',
-        location : 'Source/DynamicScene'
-    }, {
-        name : 'Renderer',
-        location : 'Source/Renderer'
-    }, {
-        name : 'Scene',
-        location : 'Source/Scene'
-    }, {
-        name : 'Shaders',
-        location : 'Source/Shaders'
-    }, {
-        name : 'Timeline',
-        location : 'Source/Timeline'
-    }, {
-        name : 'ThirdParty',
-        location : 'Source/ThirdParty'
-    }, {
-        name : 'DojoWidgets',
-        location : 'Apps/Dojo/Widgets'
-    }, {
-        name : 'DojoUtilities',
-        location : 'Apps/Dojo/Utilities'
+        name : 'Controls',
+        location : 'Source/Controls'
    }, {
        name : 'TimelineDemo',
        location : 'Apps/TimelineDemo'
--- a/Apps/TimelineDemo/index.html
+++ b/Apps/TimelineDemo/index.html
@ -6,7 +6,7 @@
 <title>Timeline Demo</title>
 <style type="text/css">
@import url('../../ThirdParty/dojo-release-1.7.2-src/dijit/themes/claro/claro.css');
-@import url('../../Source/Timeline/Timeline.css');
+@import url('../../Source/Controls/Timeline.css');

 body {
 	font-family: "Open Sans", "Trebuchet MS", Sans-Serif;
--- a/Source/Controls/Timeline.css
+++ b/Source/Controls/Timeline.css
@ -39,7 +39,6 @@
 	z-index: 100;

 	background-color: #fafafa;
-	/* background: url("images/timebar_bg.png"); */  /* fallback */
 	background-repeat: repeat-x;
 	background: -webkit-linear-gradient(top, #eee, #fff, #fafafa);
 	background: -moz-linear-gradient(top, #eee, #fff, #fafafa);
@ -98,7 +97,7 @@
 	position: absolute;
 	width: 16px;
 	height: 16px;
-	background-image: url("images/timeline_icons.png");
+	background-image: url("TimelineIcons.png");
 	background-repeat: no-repeat;
 	z-index: 10;
 }
--- a/Source/Controls/Timeline.js
+++ b/Source/Controls/Timeline.js
--- a/Source/Controls/TimelineHighlightRange.js
+++ b/Source/Controls/TimelineHighlightRange.js
--- a/Source/Timeline/images/timeline_icons.png
+++ b/Source/Timeline/images/timeline_icons.png
--- a/Source/Controls/TimelineTrack.js
+++ b/Source/Controls/TimelineTrack.js
--- a/Apps/Dojo/Widgets/templates/CesiumWidget.html
+++ b/Apps/Dojo/Widgets/templates/CesiumWidget.html
--- a/Apps/Dojo/Widgets/CesiumWidget.js
+++ b/Apps/Dojo/Widgets/CesiumWidget.js
@ -8,21 +8,21 @@ define([
        'dojo/on',
        'dijit/_WidgetBase',
        'dijit/_TemplatedMixin',
-        'Core/Ellipsoid',
-        'Core/SunPosition',
-        'Core/EventHandler',
-        'Core/MouseEventType',
-        'Core/requestAnimationFrame',
-        'Core/Cartesian2',
-        'Core/JulianDate',
-        'Core/DefaultProxy',
-        'Scene/Scene',
-        'Scene/CentralBody',
-        'Scene/BingMapsTileProvider',
-        'Scene/BingMapsStyle',
-        'Scene/SingleTileProvider',
-        'Scene/PerformanceDisplay',
-        'dojo/text!./templates/CesiumWidget.html'
+        '../Core/Ellipsoid',
+        '../Core/SunPosition',
+        '../Core/EventHandler',
+        '../Core/MouseEventType',
+        '../Core/requestAnimationFrame',
+        '../Core/Cartesian2',
+        '../Core/JulianDate',
+        '../Core/DefaultProxy',
+        '../Scene/Scene',
+        '../Scene/CentralBody',
+        '../Scene/BingMapsTileProvider',
+        '../Scene/BingMapsStyle',
+        '../Scene/SingleTileProvider',
+        '../Scene/PerformanceDisplay',
+        'dojo/text!./CesiumWidget.html'
    ], function (
        require,
        declare,
@ -49,7 +49,7 @@ define([
        template) {
    "use strict";

-    return declare('DojoWidgets.CesiumWidget', [_WidgetBase, _TemplatedMixin], {
+    return declare('CesiumDojo.CesiumWidget', [_WidgetBase, _TemplatedMixin], {
        templateString : template,
        clock : undefined,
        preRender : undefined,
--- a/Apps/Dojo/Utilities/ClockDrivenBufferUpdater.js
+++ b/Apps/Dojo/Utilities/ClockDrivenBufferUpdater.js
--- a/Apps/Dojo/Utilities/TimeIntervalBufferUpdater.js
+++ b/Apps/Dojo/Utilities/TimeIntervalBufferUpdater.js
--- a/Apps/Dojo/Widgets/TimelineWidget.css
+++ b/Apps/Dojo/Widgets/TimelineWidget.css
@ -1,4 +1,4 @@
-@import url('../../../Source/Timeline/Timeline.css');
+@import url('../Controls/Timeline.css');

 /* Support the darker theme with some modifications. */

--- a/Apps/Dojo/Widgets/TimelineWidget.js
+++ b/Apps/Dojo/Widgets/TimelineWidget.js
@ -3,7 +3,7 @@ define(['dojo/_base/declare',
        'dojo/ready',
        'dojo/dom-construct',
        'dijit/_WidgetBase',
-        'Timeline/Timeline'
+        '../Controls/Timeline'
    ], function(
        declare,
        ready,
@ -11,7 +11,7 @@ define(['dojo/_base/declare',
        _WidgetBase, Timeline) {
    "use strict";

-    return declare('DojoWidgets.TimelineWidget', [_WidgetBase], {
+    return declare('CesiumDojo.TimelineWidget', [_WidgetBase], {
        buildRendering : function() {
            this.domNode = domConstruct.create("div");
        },
--- a/Apps/Dojo/Utilities/checkForChromeFrame.js
+++ b/Apps/Dojo/Utilities/checkForChromeFrame.js
--- a/Apps/Dojo/Utilities/del.js
+++ b/Apps/Dojo/Utilities/del.js
--- a/Apps/Dojo/Utilities/fillBuffer.js
+++ b/Apps/Dojo/Utilities/fillBuffer.js
--- a/Apps/Dojo/Utilities/fillBufferIncrementally.js
+++ b/Apps/Dojo/Utilities/fillBufferIncrementally.js
--- a/Apps/Dojo/Utilities/get.js
+++ b/Apps/Dojo/Utilities/get.js
--- a/Apps/Dojo/Utilities/incrementalGet.js
+++ b/Apps/Dojo/Utilities/incrementalGet.js
--- a/Apps/CesiumViewer/loadCzmlFromUrl.js
+++ b/Apps/CesiumViewer/loadCzmlFromUrl.js
--- a/Apps/Dojo/Utilities/post.js
+++ b/Apps/Dojo/Utilities/post.js
--- a/Apps/Dojo/Utilities/put.js
+++ b/Apps/Dojo/Utilities/put.js
--- a/Apps/Dojo/Utilities/serializeDate.js
+++ b/Apps/Dojo/Utilities/serializeDate.js
@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/TimeStandard'],
+define(['../Core/TimeStandard'],
 function(TimeStandard) {
    "use strict";

--- a/Apps/Dojo/Utilities/updateBufferOnEvent.js
+++ b/Apps/Dojo/Utilities/updateBufferOnEvent.js
--- a/build.xml
+++ b/build.xml
@ -6,7 +6,7 @@
 			</glslToJavascript>

 			<createCesiumJs output="${sourceDirectory}/Cesium.js">
-				<fileset dir="${sourceDirectory}" includes="**/*.js" excludes="Cesium.js,main.js" />
+				<fileset dir="${sourceDirectory}" includes="**/*.js" excludes="Dojo/**,Controls/**,Cesium.js,main.js" />
 			</createCesiumJs>

 			<createSpecList output="${specsDirectory}/SpecList.js">
@ -39,7 +39,8 @@

 	<target name="makeZipFile" description="Builds a zip file containing all release files." depends="release">
 		<zip destfile="Cesium-${version}.zip" basedir="${basedir}">
-			<include name="Build/**" />
+            <include name="Build/**" />
+            <include name="Apps/**" />
 			<include name="Examples/**" />
 			<include name="Images/**" />
 			<include name="Source/**" />