From 30b6e6682ca6b71a72fa814792adde2150762eb4 Mon Sep 17 00:00:00 2001 From: aaronsamuel137 Date: Tue, 10 Nov 2015 15:00:11 -0700 Subject: [PATCH] remove control panel sub directories, move files to /view, see #182 --- js/common/view/{right-control-panel => }/BodyMassControl.js | 0 js/common/view/{bottom-control-panel => }/DayCounter.js | 0 js/common/view/GravityAndOrbitsCanvas.js | 4 ++-- js/common/view/GravityAndOrbitsScreenView.js | 6 +++--- js/common/view/{right-control-panel => }/GravityModeMenu.js | 0 .../view/{right-control-panel => }/MassControlPanel.js | 2 +- js/common/view/{right-control-panel => }/PlanetModeMenu.js | 0 .../view/{right-control-panel => }/RightControlPanel.js | 6 +++--- .../SpaceObjectsPropertyCheckbox.js | 0 .../view/{bottom-control-panel => }/SpeedRadioButtons.js | 0 .../view/{bottom-control-panel => }/TimeControlPanel.js | 0 11 files changed, 9 insertions(+), 9 deletions(-) rename js/common/view/{right-control-panel => }/BodyMassControl.js (100%) rename js/common/view/{bottom-control-panel => }/DayCounter.js (100%) rename js/common/view/{right-control-panel => }/GravityModeMenu.js (100%) rename js/common/view/{right-control-panel => }/MassControlPanel.js (98%) rename js/common/view/{right-control-panel => }/PlanetModeMenu.js (100%) rename js/common/view/{right-control-panel => }/RightControlPanel.js (93%) rename js/common/view/{right-control-panel => }/SpaceObjectsPropertyCheckbox.js (100%) rename js/common/view/{bottom-control-panel => }/SpeedRadioButtons.js (100%) rename js/common/view/{bottom-control-panel => }/TimeControlPanel.js (100%) diff --git a/js/common/view/right-control-panel/BodyMassControl.js b/js/common/view/BodyMassControl.js similarity index 100% rename from js/common/view/right-control-panel/BodyMassControl.js rename to js/common/view/BodyMassControl.js diff --git a/js/common/view/bottom-control-panel/DayCounter.js b/js/common/view/DayCounter.js similarity index 100% rename from js/common/view/bottom-control-panel/DayCounter.js rename to js/common/view/DayCounter.js diff --git a/js/common/view/GravityAndOrbitsCanvas.js b/js/common/view/GravityAndOrbitsCanvas.js index 5d89d135..a77e2095 100644 --- a/js/common/view/GravityAndOrbitsCanvas.js +++ b/js/common/view/GravityAndOrbitsCanvas.js @@ -25,10 +25,10 @@ define( function( require ) { var GrabbableVectorNode = require( 'GRAVITY_AND_ORBITS/common/view/GrabbableVectorNode' ); var Rectangle = require( 'SCENERY/nodes/Rectangle' ); var ExplosionNode = require( 'GRAVITY_AND_ORBITS/common/view/ExplosionNode' ); - var DayCounter = require( 'GRAVITY_AND_ORBITS/common/view/bottom-control-panel/DayCounter' ); + var DayCounter = require( 'GRAVITY_AND_ORBITS/common/view/DayCounter' ); var ScaleSlider = require( 'GRAVITY_AND_ORBITS/common/view/ScaleSlider' ); var PhetColorScheme = require( 'SCENERY_PHET/PhetColorScheme' ); - var TimeControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/bottom-control-panel/TimeControlPanel' ); + var TimeControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/TimeControlPanel' ); var MeasuringTape = require( 'SCENERY_PHET/MeasuringTape' ); // strings diff --git a/js/common/view/GravityAndOrbitsScreenView.js b/js/common/view/GravityAndOrbitsScreenView.js index befd3dd0..49ff0225 100644 --- a/js/common/view/GravityAndOrbitsScreenView.js +++ b/js/common/view/GravityAndOrbitsScreenView.js @@ -13,9 +13,9 @@ define( function( require ) { var inherit = require( 'PHET_CORE/inherit' ); var ScreenView = require( 'JOIST/ScreenView' ); var ResetAllButton = require( 'SCENERY_PHET/buttons/ResetAllButton' ); - var RightControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/RightControlPanel' ); - var SpeedRadioButtons = require( 'GRAVITY_AND_ORBITS/common/view/bottom-control-panel/SpeedRadioButtons' ); - var MassControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/MassControlPanel' ); + var RightControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/RightControlPanel' ); + var SpeedRadioButtons = require( 'GRAVITY_AND_ORBITS/common/view/SpeedRadioButtons' ); + var MassControlPanel = require( 'GRAVITY_AND_ORBITS/common/view/MassControlPanel' ); // constants var MARGIN = 5; diff --git a/js/common/view/right-control-panel/GravityModeMenu.js b/js/common/view/GravityModeMenu.js similarity index 100% rename from js/common/view/right-control-panel/GravityModeMenu.js rename to js/common/view/GravityModeMenu.js diff --git a/js/common/view/right-control-panel/MassControlPanel.js b/js/common/view/MassControlPanel.js similarity index 98% rename from js/common/view/right-control-panel/MassControlPanel.js rename to js/common/view/MassControlPanel.js index c29bad7c..969668f5 100644 --- a/js/common/view/right-control-panel/MassControlPanel.js +++ b/js/common/view/MassControlPanel.js @@ -18,7 +18,7 @@ define( function( require ) { var HStrut = require( 'SCENERY/nodes/HStrut' ); var VBox = require( 'SCENERY/nodes/VBox' ); var HBox = require( 'SCENERY/nodes/HBox' ); - var BodyMassControl = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/BodyMassControl' ); + var BodyMassControl = require( 'GRAVITY_AND_ORBITS/common/view/BodyMassControl' ); var Text = require( 'SCENERY/nodes/Text' ); var PhetFont = require( 'SCENERY_PHET/PhetFont' ); diff --git a/js/common/view/right-control-panel/PlanetModeMenu.js b/js/common/view/PlanetModeMenu.js similarity index 100% rename from js/common/view/right-control-panel/PlanetModeMenu.js rename to js/common/view/PlanetModeMenu.js diff --git a/js/common/view/right-control-panel/RightControlPanel.js b/js/common/view/RightControlPanel.js similarity index 93% rename from js/common/view/right-control-panel/RightControlPanel.js rename to js/common/view/RightControlPanel.js index 9e84c459..02baa022 100644 --- a/js/common/view/right-control-panel/RightControlPanel.js +++ b/js/common/view/RightControlPanel.js @@ -13,9 +13,9 @@ define( function( require ) { var Panel = require( 'SUN/Panel' ); var inherit = require( 'PHET_CORE/inherit' ); var Rectangle = require( 'SCENERY/nodes/Rectangle' ); - var PlanetModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/PlanetModeMenu' ); - var GravityModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/GravityModeMenu' ); - var SpaceObjectsPropertyCheckbox = require( 'GRAVITY_AND_ORBITS/common/view/right-control-panel/SpaceObjectsPropertyCheckbox' ); + var PlanetModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/PlanetModeMenu' ); + var GravityModeMenu = require( 'GRAVITY_AND_ORBITS/common/view/GravityModeMenu' ); + var SpaceObjectsPropertyCheckbox = require( 'GRAVITY_AND_ORBITS/common/view/SpaceObjectsPropertyCheckbox' ); var GravityAndOrbitsConstants = require( 'GRAVITY_AND_ORBITS/common/GravityAndOrbitsConstants' ); var VBox = require( 'SCENERY/nodes/VBox' ); diff --git a/js/common/view/right-control-panel/SpaceObjectsPropertyCheckbox.js b/js/common/view/SpaceObjectsPropertyCheckbox.js similarity index 100% rename from js/common/view/right-control-panel/SpaceObjectsPropertyCheckbox.js rename to js/common/view/SpaceObjectsPropertyCheckbox.js diff --git a/js/common/view/bottom-control-panel/SpeedRadioButtons.js b/js/common/view/SpeedRadioButtons.js similarity index 100% rename from js/common/view/bottom-control-panel/SpeedRadioButtons.js rename to js/common/view/SpeedRadioButtons.js diff --git a/js/common/view/bottom-control-panel/TimeControlPanel.js b/js/common/view/TimeControlPanel.js similarity index 100% rename from js/common/view/bottom-control-panel/TimeControlPanel.js rename to js/common/view/TimeControlPanel.js