Skip to content

Commit

Permalink
Updated references from 'Vector' to 'Vectors'. This includes variable…
Browse files Browse the repository at this point in the history
… and file names. #151
  • Loading branch information
Denz1994 committed Dec 8, 2017
1 parent d7e2d46 commit 5cc5be0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion js/lab/view/LabScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ define( function( require ) {
var massesAndSprings = require( 'MASSES_AND_SPRINGS/massesAndSprings' );
var MassesAndSpringsConstants = require( 'MASSES_AND_SPRINGS/common/MassesAndSpringsConstants' );
var OneSpringView = require( 'MASSES_AND_SPRINGS/common/view/OneSpringView' );
var VectorVisibilityControlPanel = require( 'MASSES_AND_SPRINGS/vector/view/VectorVisibilityControlPanel' );
var VectorVisibilityControlPanel = require( 'MASSES_AND_SPRINGS/vectors/view/VectorVisibilityControlPanel' );

/**
* @param {MassesAndSpringsModel} model
Expand Down
4 changes: 2 additions & 2 deletions js/masses-and-springs-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ define( function( require ) {
var Sim = require( 'JOIST/Sim' );
var SimLauncher = require( 'JOIST/SimLauncher' );
var Tandem = require( 'TANDEM/Tandem' );
var VectorScreen = require( 'MASSES_AND_SPRINGS/vector/VectorScreen' );
var VectorsScreen = require( 'MASSES_AND_SPRINGS/vectors/VectorsScreen' );

// strings
var massesAndSpringsTitleString = require( 'string!MASSES_AND_SPRINGS/masses-and-springs.title' );
Expand All @@ -37,7 +37,7 @@ define( function( require ) {
SimLauncher.launch( function() {
var sim = new Sim( massesAndSpringsTitleString, [
new IntroScreen( tandem.createTandem( 'introScreen' ) ),
new VectorScreen( tandem.createTandem( 'vectorScreen' ) ),
new VectorsScreen( tandem.createTandem( 'vectorsScreen' ) ),
new EnergyScreen( tandem.createTandem( 'energyScreen' ) ),
new LabScreen( tandem.createTandem( 'labScreen' ) )
], simOptions );
Expand Down
10 changes: 5 additions & 5 deletions js/vector/VectorScreen.js → js/vectors/VectorsScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ define( function( require ) {
var Property = require( 'AXON/Property' );
var PropertyIO = require( 'AXON/PropertyIO' );
var Screen = require( 'JOIST/Screen' );
var VectorScreenView = require( 'MASSES_AND_SPRINGS/vector/view/VectorScreenView' );
var VectorsScreenView = require( 'MASSES_AND_SPRINGS/vectors/view/VectorsScreenView' );

// strings
var screenVectorsString = require( 'string!MASSES_AND_SPRINGS/screen.vectors' );
Expand All @@ -31,7 +31,7 @@ define( function( require ) {
*
* @constructor
*/
function VectorScreen( tandem ) {
function VectorsScreen( tandem ) {

var options = {
name: screenVectorsString,
Expand All @@ -51,12 +51,12 @@ define( function( require ) {
model.addDefaultMasses( modelTandem );
return model;
},
function( model ) { return new VectorScreenView( model, tandem.createTandem( 'view' ) ); },
function( model ) { return new VectorsScreenView( model, tandem.createTandem( 'view' ) ); },
options
);
}

massesAndSprings.register( 'VectorScreen', VectorScreen );
massesAndSprings.register( 'VectorsScreen', VectorsScreen );

return inherit( Screen, VectorScreen );
return inherit( Screen, VectorsScreen );
} );
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2016-2017, University of Colorado Boulder

/**
* Common screen view for vector screen.
* Common screen view for vectors screen.
*
* @author Matt Pennington (PhET Interactive Simulations)
* @author Denzell Barnett (PhET Interactive Simulations)
Expand All @@ -14,14 +14,14 @@ define( function( require ) {
var massesAndSprings = require( 'MASSES_AND_SPRINGS/massesAndSprings' );
var MassesAndSpringsConstants = require( 'MASSES_AND_SPRINGS/common/MassesAndSpringsConstants' );
var TwoSpringView = require( 'MASSES_AND_SPRINGS/common/view/TwoSpringView' );
var VectorVisibilityControlPanel = require( 'MASSES_AND_SPRINGS/vector/view/VectorVisibilityControlPanel' );
var VectorVisibilityControlPanel = require( 'MASSES_AND_SPRINGS/vectors/view/VectorVisibilityControlPanel' );

/**
* @param {VectorModel} model
* @param {VectorsModel} model
* @param {Tandem} tandem
* @constructor
*/
function VectorScreenView( model, tandem ) {
function VectorsScreenView( model, tandem ) {

// Calls common two spring view
TwoSpringView.call( this, model, tandem );
Expand Down Expand Up @@ -50,7 +50,7 @@ define( function( require ) {
this.gravityAndDampingControlPanel.gravityNumberDisplay.visible = false;
}

massesAndSprings.register( 'VectorScreenView', VectorScreenView );
massesAndSprings.register( 'VectorsScreenView', VectorsScreenView );

return inherit( TwoSpringView, VectorScreenView );
return inherit( TwoSpringView, VectorsScreenView );
} );

0 comments on commit 5cc5be0

Please sign in to comment.