var -> const in require statements, use arrow function in define requ…

…ire call, phetsims/tasks#1010
phetsims · Sep 19, 2019 · 7c898eb · 7c898eb
1 parent 32ae72f
commit 7c898eb
Show file tree

Hide file tree

Showing 57 changed files with 524 additions and 524 deletions.
diff --git a/js/common/ProportionPlaygroundConstants.js b/js/common/ProportionPlaygroundConstants.js
@@ -5,12 +5,12 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
-  var PhetFont = require( 'SCENERY_PHET/PhetFont' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var Range = require( 'DOT/Range' );
+  const PhetFont = require( 'SCENERY_PHET/PhetFont' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const Range = require( 'DOT/Range' );
 
   var ProportionPlaygroundConstants = {
     // @public {number} - Diameter/width of the beads in the necklace scene

diff --git a/js/common/ProportionPlaygroundQueryParameters.js b/js/common/ProportionPlaygroundQueryParameters.js
@@ -5,11 +5,11 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
 
   var ProportionPlaygroundQueryParameters = QueryStringMachine.getAll( {
 

diff --git a/js/common/model/ProportionModel.js b/js/common/model/ProportionModel.js
@@ -5,18 +5,18 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var AppleScene = require( 'PROPORTION_PLAYGROUND/common/model/apples/AppleScene' );
-  var BilliardsScene = require( 'PROPORTION_PLAYGROUND/common/model/billiards/BilliardsScene' );
-  var inherit = require( 'PHET_CORE/inherit' );
-  var NecklaceScene = require( 'PROPORTION_PLAYGROUND/common/model/necklace/NecklaceScene' );
-  var PaintScene = require( 'PROPORTION_PLAYGROUND/common/model/paint/PaintScene' );
-  var Property = require( 'AXON/Property' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var ProportionPlaygroundQueryParameters = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundQueryParameters' );
+  const AppleScene = require( 'PROPORTION_PLAYGROUND/common/model/apples/AppleScene' );
+  const BilliardsScene = require( 'PROPORTION_PLAYGROUND/common/model/billiards/BilliardsScene' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const NecklaceScene = require( 'PROPORTION_PLAYGROUND/common/model/necklace/NecklaceScene' );
+  const PaintScene = require( 'PROPORTION_PLAYGROUND/common/model/paint/PaintScene' );
+  const Property = require( 'AXON/Property' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const ProportionPlaygroundQueryParameters = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundQueryParameters' );
 
   /**
    * @constructor

diff --git a/js/common/model/Scene.js b/js/common/model/Scene.js
@@ -5,15 +5,15 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var BooleanProperty = require( 'AXON/BooleanProperty' );
-  var DerivedProperty = require( 'AXON/DerivedProperty' );
-  var inherit = require( 'PHET_CORE/inherit' );
-  var Property = require( 'AXON/Property' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const BooleanProperty = require( 'AXON/BooleanProperty' );
+  const DerivedProperty = require( 'AXON/DerivedProperty' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const Property = require( 'AXON/Property' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
 
   /**
    * @constructor

diff --git a/js/common/model/SceneRatio.js b/js/common/model/SceneRatio.js
@@ -5,14 +5,14 @@
  *
  * @author Jonathan Olson <[email protected]>
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var Emitter = require( 'AXON/Emitter' );
-  var inherit = require( 'PHET_CORE/inherit' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var Side = require( 'PROPORTION_PLAYGROUND/common/model/Side' );
+  const Emitter = require( 'AXON/Emitter' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const Side = require( 'PROPORTION_PLAYGROUND/common/model/Side' );
 
   /**
    * @constructor

diff --git a/js/common/model/Side.js b/js/common/model/Side.js
@@ -5,11 +5,11 @@
  *
  * @author Jonathan Olson <[email protected]>
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
 
   var Side = {
     LEFT: 'LEFT',

diff --git a/js/common/model/apples/AppleGroup.js b/js/common/model/apples/AppleGroup.js
@@ -5,15 +5,15 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var inherit = require( 'PHET_CORE/inherit' );
-  var NumberProperty = require( 'AXON/NumberProperty' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var ProportionPlaygroundConstants = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundConstants' );
-  var SceneRatio = require( 'PROPORTION_PLAYGROUND/common/model/SceneRatio' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const NumberProperty = require( 'AXON/NumberProperty' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const ProportionPlaygroundConstants = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundConstants' );
+  const SceneRatio = require( 'PROPORTION_PLAYGROUND/common/model/SceneRatio' );
 
   /**
    * @constructor

diff --git a/js/common/model/apples/AppleScene.js b/js/common/model/apples/AppleScene.js
@@ -5,15 +5,15 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var AppleGroup = require( 'PROPORTION_PLAYGROUND/common/model/apples/AppleGroup' );
-  var BooleanProperty = require( 'AXON/BooleanProperty' );
-  var inherit = require( 'PHET_CORE/inherit' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var Scene = require( 'PROPORTION_PLAYGROUND/common/model/Scene' );
+  const AppleGroup = require( 'PROPORTION_PLAYGROUND/common/model/apples/AppleGroup' );
+  const BooleanProperty = require( 'AXON/BooleanProperty' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const Scene = require( 'PROPORTION_PLAYGROUND/common/model/Scene' );
 
   /**
    * @constructor

diff --git a/js/common/model/billiards/BilliardsScene.js b/js/common/model/billiards/BilliardsScene.js
@@ -5,14 +5,14 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var BilliardsTable = require( 'PROPORTION_PLAYGROUND/common/model/billiards/BilliardsTable' );
-  var inherit = require( 'PHET_CORE/inherit' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var Scene = require( 'PROPORTION_PLAYGROUND/common/model/Scene' );
+  const BilliardsTable = require( 'PROPORTION_PLAYGROUND/common/model/billiards/BilliardsTable' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const Scene = require( 'PROPORTION_PLAYGROUND/common/model/Scene' );
 
   /**
    * @constructor

diff --git a/js/common/model/billiards/BilliardsTable.js b/js/common/model/billiards/BilliardsTable.js
@@ -5,20 +5,20 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var BooleanProperty = require( 'AXON/BooleanProperty' );
-  var Emitter = require( 'AXON/Emitter' );
-  var inherit = require( 'PHET_CORE/inherit' );
-  var NumberProperty = require( 'AXON/NumberProperty' );
-  var ObservableArray = require( 'AXON/ObservableArray' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var ProportionPlaygroundConstants = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundConstants' );
-  var SceneRatio = require( 'PROPORTION_PLAYGROUND/common/model/SceneRatio' );
-  var Vector2 = require( 'DOT/Vector2' );
-  var Vector2Property = require( 'DOT/Vector2Property' );
+  const BooleanProperty = require( 'AXON/BooleanProperty' );
+  const Emitter = require( 'AXON/Emitter' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const NumberProperty = require( 'AXON/NumberProperty' );
+  const ObservableArray = require( 'AXON/ObservableArray' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const ProportionPlaygroundConstants = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundConstants' );
+  const SceneRatio = require( 'PROPORTION_PLAYGROUND/common/model/SceneRatio' );
+  const Vector2 = require( 'DOT/Vector2' );
+  const Vector2Property = require( 'DOT/Vector2Property' );
 
   // constants
   var scratchVector = new Vector2( 0, 0 );

diff --git a/js/common/model/necklace/Necklace.js b/js/common/model/necklace/Necklace.js
@@ -6,17 +6,17 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var DerivedProperty = require( 'AXON/DerivedProperty' );
-  var inherit = require( 'PHET_CORE/inherit' );
-  var NecklaceLayout = require( 'PROPORTION_PLAYGROUND/common/model/necklace/NecklaceLayout' );
-  var NumberProperty = require( 'AXON/NumberProperty' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var ProportionPlaygroundConstants = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundConstants' );
-  var SceneRatio = require( 'PROPORTION_PLAYGROUND/common/model/SceneRatio' );
+  const DerivedProperty = require( 'AXON/DerivedProperty' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const NecklaceLayout = require( 'PROPORTION_PLAYGROUND/common/model/necklace/NecklaceLayout' );
+  const NumberProperty = require( 'AXON/NumberProperty' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const ProportionPlaygroundConstants = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundConstants' );
+  const SceneRatio = require( 'PROPORTION_PLAYGROUND/common/model/SceneRatio' );
 
   /**
    * @constructor

diff --git a/js/common/model/necklace/NecklaceLayout.js b/js/common/model/necklace/NecklaceLayout.js
@@ -8,19 +8,19 @@
  * @author Sam Reid (PhET Interactive Simulations)
  * @author Andrea Lin
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var inherit = require( 'PHET_CORE/inherit' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var ProportionPlaygroundConstants = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundConstants' );
-  var Random = require( 'DOT/Random' );
-  var RoundBead = require( 'PROPORTION_PLAYGROUND/common/model/necklace/RoundBead' );
-  var Shape = require( 'KITE/Shape' );
-  var SquareBead = require( 'PROPORTION_PLAYGROUND/common/model/necklace/SquareBead' );
-  var Util = require( 'DOT/Util' );
-  var Vector2 = require( 'DOT/Vector2' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const ProportionPlaygroundConstants = require( 'PROPORTION_PLAYGROUND/common/ProportionPlaygroundConstants' );
+  const Random = require( 'DOT/Random' );
+  const RoundBead = require( 'PROPORTION_PLAYGROUND/common/model/necklace/RoundBead' );
+  const Shape = require( 'KITE/Shape' );
+  const SquareBead = require( 'PROPORTION_PLAYGROUND/common/model/necklace/SquareBead' );
+  const Util = require( 'DOT/Util' );
+  const Vector2 = require( 'DOT/Vector2' );
 
   // {number} - The diameter of beads (for the square bead, it's from the center of the bead to the center of a side)
   var BEAD_DIAMETER = ProportionPlaygroundConstants.BEAD_DIAMETER;

diff --git a/js/common/model/necklace/NecklaceScene.js b/js/common/model/necklace/NecklaceScene.js
@@ -5,14 +5,14 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var inherit = require( 'PHET_CORE/inherit' );
-  var Necklace = require( 'PROPORTION_PLAYGROUND/common/model/necklace/Necklace' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var Scene = require( 'PROPORTION_PLAYGROUND/common/model/Scene' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const Necklace = require( 'PROPORTION_PLAYGROUND/common/model/necklace/Necklace' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const Scene = require( 'PROPORTION_PLAYGROUND/common/model/Scene' );
 
   /**
    * @constructor

diff --git a/js/common/model/necklace/RoundBead.js b/js/common/model/necklace/RoundBead.js
@@ -5,12 +5,12 @@
  *
  * @author Jonathan Olson
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var inherit = require( 'PHET_CORE/inherit' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
 
   /**
    * @constructor

diff --git a/js/common/model/necklace/SquareBead.js b/js/common/model/necklace/SquareBead.js
@@ -5,12 +5,12 @@
  *
  * @author Jonathan Olson
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var inherit = require( 'PHET_CORE/inherit' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
 
   /**
    * @constructor

diff --git a/js/common/model/paint/PaintBalloon.js b/js/common/model/paint/PaintBalloon.js
@@ -5,12 +5,12 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var inherit = require( 'PHET_CORE/inherit' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
 
   // {number} - In seconds, the time from "launch" to when the balloon "hits" the splotch.
   var TIME_TO_HIT = 0.5;

diff --git a/js/common/model/paint/PaintChoice.js b/js/common/model/paint/PaintChoice.js
@@ -7,16 +7,16 @@
  * @author Sam Reid (PhET Interactive Simulations)
  * @author Jonathan Olson <[email protected]>
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var Color = require( 'SCENERY/util/Color' );
-  var DerivedProperty = require( 'AXON/DerivedProperty' );
-  var inherit = require( 'PHET_CORE/inherit' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
-  var ProportionPlaygroundColorProfile = require( 'PROPORTION_PLAYGROUND/common/view/ProportionPlaygroundColorProfile' );
-  var Side = require( 'PROPORTION_PLAYGROUND/common/model/Side' );
+  const Color = require( 'SCENERY/util/Color' );
+  const DerivedProperty = require( 'AXON/DerivedProperty' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const ProportionPlaygroundColorProfile = require( 'PROPORTION_PLAYGROUND/common/view/ProportionPlaygroundColorProfile' );
+  const Side = require( 'PROPORTION_PLAYGROUND/common/model/Side' );
 
   /**
    * Models mixing of watercolor paints with the weighted geometric mean, then with an applied gamma correction.

diff --git a/js/common/model/paint/PaintDrip.js b/js/common/model/paint/PaintDrip.js
@@ -5,12 +5,12 @@
  *
  * @author Sam Reid (PhET Interactive Simulations)
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var inherit = require( 'PHET_CORE/inherit' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
 
   /**
    * @constructor

diff --git a/js/common/model/paint/PaintQuantity.js b/js/common/model/paint/PaintQuantity.js
@@ -5,13 +5,13 @@
  *
  * @author Jonathan Olson <[email protected]>
  */
-define( function( require ) {
+define( require => {
   'use strict';
 
   // modules
-  var inherit = require( 'PHET_CORE/inherit' );
-  var NumberProperty = require( 'AXON/NumberProperty' );
-  var proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
+  const inherit = require( 'PHET_CORE/inherit' );
+  const NumberProperty = require( 'AXON/NumberProperty' );
+  const proportionPlayground = require( 'PROPORTION_PLAYGROUND/proportionPlayground' );
 
   /**
    * @constructor