From 3574de78a154d6b1d3f08e9e307d8c91c6ccf64c Mon Sep 17 00:00:00 2001 From: samreid Date: Thu, 27 Feb 2020 11:38:06 -0700 Subject: [PATCH] Add repo to migration list, see https://github.com/phetsims/chipper/issues/875 --- area-model-algebra_en.html | 51 +++++++++++++++++++++++++---- js/area-model-algebra-config.js | 52 ----------------------------- js/area-model-algebra-main.js | 56 +++++++++++++++----------------- js/area-model-algebra-strings.js | 14 ++++++++ js/areaModelAlgebra.js | 10 ++++++ 5 files changed, 94 insertions(+), 89 deletions(-) delete mode 100644 js/area-model-algebra-config.js create mode 100644 js/area-model-algebra-strings.js create mode 100644 js/areaModelAlgebra.js diff --git a/area-model-algebra_en.html b/area-model-algebra_en.html index 77fc731..96ee556 100644 --- a/area-model-algebra_en.html +++ b/area-model-algebra_en.html @@ -17,6 +17,39 @@ \ No newline at end of file diff --git a/js/area-model-algebra-config.js b/js/area-model-algebra-config.js deleted file mode 100644 index 43dde5e..0000000 --- a/js/area-model-algebra-config.js +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2018-2019, University of Colorado Boulder - -/* - * IMPORTANT: This file was auto-generated by "grunt generate-config". Please do not modify this directly. Instead - * please modify area-model-algebra/package.json to control dependencies. - * - * RequireJS configuration file for the area-model-algebra sim. - * Paths are relative to the location of this file. - */ - -require.config( { - - deps: [ 'area-model-algebra-main' ], - - paths: { - - // Third-party libs - text: '../../sherpa/lib/text-2.0.12', - - // PhET plugins - sound: '../../chipper/js/requirejs-plugins/sound', - image: '../../chipper/js/requirejs-plugins/image', - mipmap: '../../chipper/js/requirejs-plugins/mipmap', - string: '../../chipper/js/requirejs-plugins/string', - ifphetio: '../../chipper/js/requirejs-plugins/ifphetio', - - // PhET libs, uppercase names to identify them in require.js imports. - // IMPORTANT: DO NOT modify. This file is auto-generated. See documentation at the top. - AREA_MODEL_ALGEBRA: '.', - AREA_MODEL_COMMON: '../../area-model-common/js', - AXON: '../../axon/js', - BRAND: '../../brand/' + phet.chipper.brand + '/js', - DOT: '../../dot/js', - JOIST: '../../joist/js', - KITE: '../../kite/js', - PHETCOMMON: '../../phetcommon/js', - PHET_CORE: '../../phet-core/js', - PHET_IO: '../../phet-io/js', - REPOSITORY: '..', - SCENERY: '../../scenery/js', - SCENERY_PHET: '../../scenery-phet/js', - SUN: '../../sun/js', - TAMBO: '../../tambo/js', - TANDEM: '../../tandem/js', - TWIXT: '../../twixt/js', - UTTERANCE_QUEUE: '../../utterance-queue/js', - VEGAS: '../../vegas/js' - }, - - // Cache busting is applied by default, but can be disabled via ?cacheBust=false, see initialize-globals.js - urlArgs: phet.chipper.getCacheBustArgs() -} ); diff --git a/js/area-model-algebra-main.js b/js/area-model-algebra-main.js index 4171829..e7aa56b 100644 --- a/js/area-model-algebra-main.js +++ b/js/area-model-algebra-main.js @@ -5,37 +5,33 @@ * * @author Jonathan Olson */ -define( require => { - 'use strict'; - // modules - const ExploreScreen = require( 'AREA_MODEL_COMMON/screens/ExploreScreen' ); - const GenericScreen = require( 'AREA_MODEL_COMMON/screens/GenericScreen' ); - const Sim = require( 'JOIST/Sim' ); - const SimLauncher = require( 'JOIST/SimLauncher' ); - const VariablesGameScreen = require( 'AREA_MODEL_COMMON/screens/VariablesGameScreen' ); - const VariablesScreen = require( 'AREA_MODEL_COMMON/screens/VariablesScreen' ); +import ExploreScreen from '../../area-model-common/js/screens/ExploreScreen.js'; +import GenericScreen from '../../area-model-common/js/screens/GenericScreen.js'; +import VariablesGameScreen from '../../area-model-common/js/screens/VariablesGameScreen.js'; +import VariablesScreen from '../../area-model-common/js/screens/VariablesScreen.js'; +import Sim from '../../joist/js/Sim.js'; +import SimLauncher from '../../joist/js/SimLauncher.js'; +import areaModelAlgebraStrings from './area-model-algebra-strings.js'; - // strings - const areaModelAlgebraTitleString = require( 'string!AREA_MODEL_ALGEBRA/area-model-algebra.title' ); +const areaModelAlgebraTitleString = areaModelAlgebraStrings[ 'area-model-algebra' ].title; - const simOptions = { - credits: { - leadDesign: 'Amy Hanson, Amanda McGarry', - softwareDevelopment: 'Jonathan Olson', - team: 'Karina Hensberry, Susan Miller, Ariel Paul, Kathy Perkins, Oliver Nix', - qualityAssurance: 'Steele Dalton, Bryce Griebenow, Ethan Johnson, Liam Mulhall, Ben Roberts, Jacob Romero, Ethan Ward, Clara Wilson, Kathryn Woessner', - graphicArts: 'Mariah Hermsmeyer, Amanda McGarry, Diana L\u00f3pez Tavares' - } - }; +const simOptions = { + credits: { + leadDesign: 'Amy Hanson, Amanda McGarry', + softwareDevelopment: 'Jonathan Olson', + team: 'Karina Hensberry, Susan Miller, Ariel Paul, Kathy Perkins, Oliver Nix', + qualityAssurance: 'Steele Dalton, Bryce Griebenow, Ethan Johnson, Liam Mulhall, Ben Roberts, Jacob Romero, Ethan Ward, Clara Wilson, Kathryn Woessner', + graphicArts: 'Mariah Hermsmeyer, Amanda McGarry, Diana L\u00f3pez Tavares' + } +}; - SimLauncher.launch( function() { - const sim = new Sim( areaModelAlgebraTitleString, [ - new ExploreScreen(), - new GenericScreen(), - new VariablesScreen(), - new VariablesGameScreen() - ], simOptions ); - sim.start(); - } ); -} ); +SimLauncher.launch( function() { + const sim = new Sim( areaModelAlgebraTitleString, [ + new ExploreScreen(), + new GenericScreen(), + new VariablesScreen(), + new VariablesGameScreen() + ], simOptions ); + sim.start(); +} ); \ No newline at end of file diff --git a/js/area-model-algebra-strings.js b/js/area-model-algebra-strings.js new file mode 100644 index 0000000..9d8886c --- /dev/null +++ b/js/area-model-algebra-strings.js @@ -0,0 +1,14 @@ +// Copyright 2020, University of Colorado Boulder + +/** + * Auto-generated from modulify, DO NOT manually modify. + */ + +import getStringModule from '../../chipper/js/getStringModule.js'; +import areaModelAlgebra from './areaModelAlgebra.js'; + +const areaModelAlgebraStrings = getStringModule( 'AREA_MODEL_ALGEBRA' ); + +areaModelAlgebra.register( 'areaModelAlgebraStrings', areaModelAlgebraStrings ); + +export default areaModelAlgebraStrings; diff --git a/js/areaModelAlgebra.js b/js/areaModelAlgebra.js new file mode 100644 index 0000000..79e577d --- /dev/null +++ b/js/areaModelAlgebra.js @@ -0,0 +1,10 @@ +// Copyright 2020, University of Colorado Boulder + +/** + * Creates the namespace for this simulation. + */ + +// modules +import Namespace from '../../phet-core/js/Namespace.js'; + +export default new Namespace( 'areaModelAlgebra' );