diff --git a/Apps/CesiumViewer/CesiumViewer.js b/Apps/CesiumViewer/CesiumViewer.js index 7b17d4082fab..21afd11f3897 100644 --- a/Apps/CesiumViewer/CesiumViewer.js +++ b/Apps/CesiumViewer/CesiumViewer.js @@ -5,8 +5,8 @@ define([ 'Cesium/Core/formatError', 'Cesium/Core/getFilenameFromUri', 'Cesium/Core/Math', - 'Cesium/Core/queryToObject', 'Cesium/Core/objectToQuery', + 'Cesium/Core/queryToObject', 'Cesium/DataSources/CzmlDataSource', 'Cesium/DataSources/GeoJsonDataSource', 'Cesium/DataSources/KmlDataSource', @@ -21,8 +21,8 @@ define([ formatError, getFilenameFromUri, CesiumMath, - queryToObject, objectToQuery, + queryToObject, CzmlDataSource, GeoJsonDataSource, KmlDataSource, diff --git a/Apps/CesiumViewer/CesiumViewerStartup.js b/Apps/CesiumViewer/CesiumViewerStartup.js index 498c089728d9..349f461fcdc2 100644 --- a/Apps/CesiumViewer/CesiumViewerStartup.js +++ b/Apps/CesiumViewer/CesiumViewerStartup.js @@ -5,5 +5,7 @@ require({ domReady : '../../ThirdParty/requirejs-2.1.9/domReady', Cesium : '../../Source' } -}, ['CesiumViewer'], function() { +}, [ + 'CesiumViewer' + ], function() { }); \ No newline at end of file diff --git a/Apps/Sandcastle/CesiumSandcastle.js b/Apps/Sandcastle/CesiumSandcastle.js index e2908d00c0a7..eb3522f3c92e 100644 --- a/Apps/Sandcastle/CesiumSandcastle.js +++ b/Apps/Sandcastle/CesiumSandcastle.js @@ -20,6 +20,7 @@ require({ location : '../ThirdParty/codemirror-4.6' }] }, [ + 'CodeMirror/lib/codemirror', 'dijit/layout/ContentPane', 'dijit/popup', 'dijit/registry', @@ -36,7 +37,6 @@ require({ 'dojo/query', 'Sandcastle/LinkButton', 'Source/Cesium', - 'CodeMirror/lib/codemirror', 'CodeMirror/addon/hint/show-hint', 'CodeMirror/addon/hint/javascript-hint', 'CodeMirror/mode/javascript/javascript', @@ -59,6 +59,7 @@ require({ 'dijit/ToolbarSeparator', 'dojo/domReady!' ], function( + CodeMirror, ContentPane, popup, registry, @@ -74,8 +75,7 @@ require({ parser, query, LinkButton, - Cesium, - CodeMirror) { + Cesium) { "use strict"; //In order for CodeMirror auto-complete to work, Cesium needs to be defined as a global. diff --git a/Source/Core/OrientedBoundingBox.js b/Source/Core/OrientedBoundingBox.js index fa6ebaf47aa8..49da79fb9475 100644 --- a/Source/Core/OrientedBoundingBox.js +++ b/Source/Core/OrientedBoundingBox.js @@ -11,10 +11,10 @@ define([ './EllipsoidTangentPlane', './Intersect', './Interval', - './Plane', - './Rectangle', './Math', - './Matrix3' + './Matrix3', + './Plane', + './Rectangle' ], function( BoundingSphere, Cartesian2, @@ -27,10 +27,10 @@ define([ EllipsoidTangentPlane, Intersect, Interval, - Plane, - Rectangle, CesiumMath, - Matrix3) { + Matrix3, + Plane, + Rectangle) { "use strict"; /** diff --git a/Source/DataSources/CzmlDataSource.js b/Source/DataSources/CzmlDataSource.js index 36f0d0da4ac4..28ff6e498b59 100644 --- a/Source/DataSources/CzmlDataSource.js +++ b/Source/DataSources/CzmlDataSource.js @@ -35,7 +35,6 @@ define([ '../Scene/VerticalOrigin', '../ThirdParty/Uri', '../ThirdParty/when', - './Rotation', './BillboardGraphics', './ColorMaterialProperty', './CompositeMaterialProperty', @@ -61,6 +60,7 @@ define([ './PositionPropertyArray', './RectangleGraphics', './ReferenceProperty', + './Rotation', './SampledPositionProperty', './SampledProperty', './StripeMaterialProperty', @@ -104,7 +104,6 @@ define([ VerticalOrigin, Uri, when, - Rotation, BillboardGraphics, ColorMaterialProperty, CompositeMaterialProperty, @@ -130,6 +129,7 @@ define([ PositionPropertyArray, RectangleGraphics, ReferenceProperty, + Rotation, SampledPositionProperty, SampledProperty, StripeMaterialProperty, diff --git a/Source/Scene/ArcGisMapServerImageryProvider.js b/Source/Scene/ArcGisMapServerImageryProvider.js index b8af1c9e3b26..e0893ab8f654 100644 --- a/Source/Scene/ArcGisMapServerImageryProvider.js +++ b/Source/Scene/ArcGisMapServerImageryProvider.js @@ -3,7 +3,6 @@ define([ '../Core/Cartesian2', '../Core/Cartesian3', '../Core/Cartographic', - '../Core/Math', '../Core/Credit', '../Core/defaultValue', '../Core/defined', @@ -14,6 +13,7 @@ define([ '../Core/GeographicTilingScheme', '../Core/jsonp', '../Core/loadJson', + '../Core/Math', '../Core/Rectangle', '../Core/TileProviderError', '../Core/WebMercatorProjection', @@ -26,7 +26,6 @@ define([ Cartesian2, Cartesian3, Cartographic, - CesiumMath, Credit, defaultValue, defined, @@ -37,6 +36,7 @@ define([ GeographicTilingScheme, jsonp, loadJson, + CesiumMath, Rectangle, TileProviderError, WebMercatorProjection, diff --git a/Source/Scene/CullingVolume.js b/Source/Scene/CullingVolume.js index 09fc1aa0597e..d764d468deaa 100644 --- a/Source/Scene/CullingVolume.js +++ b/Source/Scene/CullingVolume.js @@ -1,15 +1,15 @@ /*global define*/ define([ + '../Core/Cartesian3', '../Core/defaultValue', '../Core/defined', - '../Core/Cartesian3', '../Core/DeveloperError', '../Core/Intersect', '../Core/Plane' ], function( + Cartesian3, defaultValue, defined, - Cartesian3, DeveloperError, Intersect, Plane) { diff --git a/Source/Scene/PointPrimitiveCollection.js b/Source/Scene/PointPrimitiveCollection.js index 07344fcc46a9..051dcf03644c 100644 --- a/Source/Scene/PointPrimitiveCollection.js +++ b/Source/Scene/PointPrimitiveCollection.js @@ -23,9 +23,9 @@ define([ '../Renderer/VertexArrayFacade', '../Shaders/PointPrimitiveCollectionFS', '../Shaders/PointPrimitiveCollectionVS', - './PointPrimitive', './BlendingState', './Pass', + './PointPrimitive', './SceneMode' ], function( BoundingSphere, @@ -51,9 +51,9 @@ define([ VertexArrayFacade, PointPrimitiveCollectionFS, PointPrimitiveCollectionVS, - PointPrimitive, BlendingState, Pass, + PointPrimitive, SceneMode) { "use strict"; diff --git a/Source/Scene/UrlTemplateImageryProvider.js b/Source/Scene/UrlTemplateImageryProvider.js index 7f78c0e97f5a..c9a8870b0106 100644 --- a/Source/Scene/UrlTemplateImageryProvider.js +++ b/Source/Scene/UrlTemplateImageryProvider.js @@ -4,7 +4,6 @@ define([ '../Core/Cartesian3', '../Core/Cartographic', '../Core/combine', - '../Core/Math', '../Core/Credit', '../Core/defaultValue', '../Core/defined', @@ -17,6 +16,7 @@ define([ '../Core/loadText', '../Core/loadWithXhr', '../Core/loadXML', + '../Core/Math', '../Core/Rectangle', '../Core/TileProviderError', '../Core/WebMercatorTilingScheme', @@ -27,7 +27,6 @@ define([ Cartesian3, Cartographic, combine, - CesiumMath, Credit, defaultValue, defined, @@ -40,6 +39,7 @@ define([ loadText, loadWithXhr, loadXML, + CesiumMath, Rectangle, TileProviderError, WebMercatorTilingScheme, diff --git a/Specs/Core/OrientedBoundingBoxSpec.js b/Specs/Core/OrientedBoundingBoxSpec.js index 3250fb327bd2..7773d1f751e7 100644 --- a/Specs/Core/OrientedBoundingBoxSpec.js +++ b/Specs/Core/OrientedBoundingBoxSpec.js @@ -1,8 +1,8 @@ /*global defineSuite*/ defineSuite([ 'Core/OrientedBoundingBox', - 'Core/BoundingSphere', 'Core/BoundingRectangle', + 'Core/BoundingSphere', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/Ellipsoid', @@ -16,8 +16,8 @@ defineSuite([ 'Core/Rectangle' ], function( OrientedBoundingBox, - BoundingSphere, BoundingRectangle, + BoundingSphere, Cartesian3, Cartesian4, Ellipsoid, diff --git a/Specs/Core/getStringFromTypedArraySpec.js b/Specs/Core/getStringFromTypedArraySpec.js index 720ff8cbe9e2..8f36002c5f54 100644 --- a/Specs/Core/getStringFromTypedArraySpec.js +++ b/Specs/Core/getStringFromTypedArraySpec.js @@ -2,7 +2,7 @@ defineSuite([ 'Core/getStringFromTypedArray' ], function( - getStringFromTypedArray) { + getStringFromTypedArray) { "use strict"; /*global jasmine,describe,xdescribe,it,xit,expect,beforeEach,afterEach,beforeAll,afterAll,spyOn,runs,waits,waitsFor*/ diff --git a/Specs/DataSources/PathVisualizerSpec.js b/Specs/DataSources/PathVisualizerSpec.js index 7030eb14c896..3483a8865404 100644 --- a/Specs/DataSources/PathVisualizerSpec.js +++ b/Specs/DataSources/PathVisualizerSpec.js @@ -3,8 +3,8 @@ defineSuite([ 'DataSources/PathVisualizer', 'Core/Cartesian3', 'Core/Color', - 'Core/Matrix4', 'Core/JulianDate', + 'Core/Matrix4', 'Core/ReferenceFrame', 'Core/TimeInterval', 'DataSources/CompositePositionProperty', @@ -24,8 +24,8 @@ defineSuite([ PathVisualizer, Cartesian3, Color, - Matrix4, JulianDate, + Matrix4, ReferenceFrame, TimeInterval, CompositePositionProperty, diff --git a/Specs/Scene/SceneSpec.js b/Specs/Scene/SceneSpec.js index 6bed1956f964..431271f1cedb 100644 --- a/Specs/Scene/SceneSpec.js +++ b/Specs/Scene/SceneSpec.js @@ -24,8 +24,8 @@ defineSuite([ 'Scene/FrameState', 'Scene/Globe', 'Scene/Pass', - 'Scene/PrimitiveCollection', 'Scene/Primitive', + 'Scene/PrimitiveCollection', 'Scene/Scene', 'Scene/ScreenSpaceCameraController', 'Scene/TweenCollection', @@ -58,8 +58,8 @@ defineSuite([ FrameState, Globe, Pass, - PrimitiveCollection, Primitive, + PrimitiveCollection, Scene, ScreenSpaceCameraController, TweenCollection, diff --git a/Specs/Scene/UrlTemplateImageryProviderSpec.js b/Specs/Scene/UrlTemplateImageryProviderSpec.js index 8e50aaa6ae09..ae6787127cbe 100644 --- a/Specs/Scene/UrlTemplateImageryProviderSpec.js +++ b/Specs/Scene/UrlTemplateImageryProviderSpec.js @@ -1,36 +1,36 @@ /*global defineSuite*/ defineSuite([ - 'Scene/UrlTemplateImageryProvider', - 'Core/DefaultProxy', - 'Core/Ellipsoid', - 'Core/GeographicTilingScheme', - 'Core/loadImage', - 'Core/Math', - 'Core/Rectangle', - 'Core/WebMercatorProjection', - 'Core/WebMercatorTilingScheme', - 'Scene/Imagery', - 'Scene/ImageryLayer', - 'Scene/ImageryProvider', - 'Scene/ImageryState', - 'Specs/pollToPromise', - 'ThirdParty/when' -], function( - UrlTemplateImageryProvider, - DefaultProxy, - Ellipsoid, - GeographicTilingScheme, - loadImage, - CesiumMath, - Rectangle, - WebMercatorProjection, - WebMercatorTilingScheme, - Imagery, - ImageryLayer, - ImageryProvider, - ImageryState, - pollToPromise, - when) { + 'Scene/UrlTemplateImageryProvider', + 'Core/DefaultProxy', + 'Core/Ellipsoid', + 'Core/GeographicTilingScheme', + 'Core/loadImage', + 'Core/Math', + 'Core/Rectangle', + 'Core/WebMercatorProjection', + 'Core/WebMercatorTilingScheme', + 'Scene/Imagery', + 'Scene/ImageryLayer', + 'Scene/ImageryProvider', + 'Scene/ImageryState', + 'Specs/pollToPromise', + 'ThirdParty/when' + ], function( + UrlTemplateImageryProvider, + DefaultProxy, + Ellipsoid, + GeographicTilingScheme, + loadImage, + CesiumMath, + Rectangle, + WebMercatorProjection, + WebMercatorTilingScheme, + Imagery, + ImageryLayer, + ImageryProvider, + ImageryState, + pollToPromise, + when) { "use strict"; /*global jasmine,describe,xdescribe,it,xit,expect,beforeEach,afterEach,beforeAll,afterAll,spyOn*/ diff --git a/Specs/Widgets/Viewer/ViewerSpec.js b/Specs/Widgets/Viewer/ViewerSpec.js index cecf6cfae430..dd53f762b4a9 100644 --- a/Specs/Widgets/Viewer/ViewerSpec.js +++ b/Specs/Widgets/Viewer/ViewerSpec.js @@ -24,11 +24,11 @@ defineSuite([ 'Widgets/Animation/Animation', 'Widgets/BaseLayerPicker/BaseLayerPicker', 'Widgets/BaseLayerPicker/ProviderViewModel', - 'Widgets/NavigationHelpButton/NavigationHelpButton', 'Widgets/CesiumWidget/CesiumWidget', 'Widgets/FullscreenButton/FullscreenButton', 'Widgets/Geocoder/Geocoder', 'Widgets/HomeButton/HomeButton', + 'Widgets/NavigationHelpButton/NavigationHelpButton', 'Widgets/SceneModePicker/SceneModePicker', 'Widgets/SelectionIndicator/SelectionIndicator', 'Widgets/Timeline/Timeline' @@ -57,11 +57,11 @@ defineSuite([ Animation, BaseLayerPicker, ProviderViewModel, - NavigationHelpButton, CesiumWidget, FullscreenButton, Geocoder, HomeButton, + NavigationHelpButton, SceneModePicker, SelectionIndicator, Timeline) { diff --git a/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js b/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js index 4aa66941a928..bd22bad03d47 100644 --- a/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js +++ b/Specs/Widgets/Viewer/viewerPerformanceWatchdogMixinSpec.js @@ -1,12 +1,12 @@ /*global defineSuite*/ defineSuite([ 'Specs/createViewer', - 'Widgets/Viewer/viewerPerformanceWatchdogMixin', - 'Widgets/PerformanceWatchdog/PerformanceWatchdog' + 'Widgets/PerformanceWatchdog/PerformanceWatchdog', + 'Widgets/Viewer/viewerPerformanceWatchdogMixin' ], function( createViewer, - viewerPerformanceWatchdogMixin, - PerformanceWatchdog) { + PerformanceWatchdog, + viewerPerformanceWatchdogMixin) { "use strict"; /*global jasmine,describe,xdescribe,it,xit,expect,beforeEach,afterEach,beforeAll,afterAll,spyOn*/ diff --git a/package.json b/package.json index 3dbb5bebfefd..e3704b1f42b3 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,10 @@ "url": "https://github.com/AnalyticalGraphicsInc/cesium.git" }, "devDependencies": { - "jsdoc": "3.3.2", - "express": "4.13.1", - "compression": "1.5.1", - "request": "2.58.0", - "yargs": "3.15.0" + "jsdoc": "3.3.3", + "express": "4.13.3", + "compression": "1.6.0", + "request": "2.65.0", + "yargs": "3.27.0" } } \ No newline at end of file