Merge branch '1.2' into 1.1, resuming release of 1.1 branch, see

#130

.gitignore

@@ -1,5 +1,10 @@
+.idea/
 build/
+build-phet-io/
 node_modules/
 *.iml
 .DS_Store
-.DS_Store?
+.DS_Store?
+*.sublime-project
+*.sublime-workspace
+.eslintcache

Gruntfile.js

@@ -1,2 +1,2 @@
 // use chipper's gruntfile
-module.exports = require( '../chipper/grunt/Gruntfile.js' );
+module.exports = require( '../chipper/js/grunt/Gruntfile.js' );

README.md

@@ -1,19 +1,52 @@
-balloons-and-static-electricity
+Balloons and Static Electricity
 =============
+"Balloons and Static Electricity" is an educational simulation in HTML5, by <a href="http://phet.colorado.edu/" target="_blank">PhET Interactive Simulations</a>
+at the University of Colorado Boulder.
+For a description of this simulation, associated resources, and a link to the published version,
+<a href="http://phet.colorado.edu/en/simulation/balloons-and-static-electricity" target="_blank">visit the simulation's web page</a>.
 
-Balloons and Static Electricity
+### Try it!
 
-Why does a balloon stick to your sweater? Rub a balloon on a sweater, then let go of the balloon and it flies over and sticks to the sweater. View the charges in the sweater, balloons, and the wall.
+<a href="http://phet.colorado.edu/sims/html/balloons-and-static-electricity/latest/balloons-and-static-electricity_en.html" target="_blank">Click here to run "Balloons and Static Electricity".</a>
 
-By PhET Interactive Simulations
-http://phet.colorado.edu/
+<a href="http://phet.colorado.edu/sims/html/balloons-and-static-electricity/latest/balloons-and-static-electricity_en.html" target="_blank">
+<img src="https://raw.githubusercontent.com/phetsims/balloons-and-static-electricity/master/assets/balloons-and-static-electricity-screenshot.png" alt="Screenshot" style="width: 400px;"/>
+</a>
 
-NOTE: This repository has dependencies on other repositories. Those repositories
-much be checked out as siblings to this repository in your directory structure.
-See package.json for a list of dependencies.
+### Documentation
+The <a href="http://bit.ly/phet-development-overview" target="_blank">PhET Development Overview</a> is the most complete guide to PhET Simulation
+Development. This guide includes how to obtain simulation code and its dependencies, notes about architecture & design, how to test and build
+the sims, as well as other important information.
 
-Third-Party Dependencies
-=============
+### Quick Start
+(1) Clone the simulation and its dependencies:
+```
+git clone https://github.com/phetsims/assert.git
+git clone https://github.com/phetsims/axon.git
+git clone https://github.com/phetsims/babel.git
+git clone https://github.com/phetsims/balloons-and-static-electricity.git
+git clone https://github.com/phetsims/brand.git
+git clone https://github.com/phetsims/chipper.git
+git clone https://github.com/phetsims/dot.git
+git clone https://github.com/phetsims/joist.git
+git clone https://github.com/phetsims/kite.git
+git clone https://github.com/phetsims/phet-core.git
+git clone https://github.com/phetsims/phetcommon.git
+git clone https://github.com/phetsims/scenery.git
+git clone https://github.com/phetsims/scenery-phet.git
+git clone https://github.com/phetsims/sherpa.git
+git clone https://github.com/phetsims/sun.git
+git clone https://github.com/phetsims/tandem.git
+```
+(2) Start an http-server
+
+(3) Open `http://localhost/balloons-and-static-electricity/balloons-and-static-electricity_en.html` (You will probably need to modify this URL based on your HTTP port and relative path.)
+
+### Get Involved
+
+Contact us at our Google Group: <a href="http://groups.google.com/forum/#!forum/developing-interactive-simulations-in-html5" target="_blank">Developing Interactive Simulations in HTML5</a>
+
+Help us improve, create a <a href="http://github.com/phetsims/balloons-and-static-electricity/issues/new" target="_blank">New Issue</a>
 
-This repository uses third-party libraries.
-Those libraries and their licenses are available in: https://github.com/phetsims/sherpa.
+### License
+See the <a href="https://github.com/phetsims/balloons-and-static-electricity/blob/master/LICENSE" target="_blank">LICENSE</a>

balloons-and-static-electricity-strings_en.json

@@ -0,0 +1,26 @@
+ {
+  "balloons-and-static-electricity.title": {
+    "value": "Balloons and Static Electricity"
+  },
+  "BalloonApplet.ShowChargeDifferences": {
+    "value": "Show charge differences"
+  },
+  "BalloonApplet.ShowAllCharges": {
+    "value": "Show all charges"
+  },
+  "BalloonApplet.ShowNoCharges": {
+    "value": "Show no charges"
+  },
+  "removeWall": {
+    "value": "Remove\nWall"
+  },
+  "addWall": {
+    "value": "Add\nWall"
+  },
+  "resetBalloon": {
+    "value": "Reset Balloon"
+  },
+  "resetBalloons": {
+    "value": "Reset Balloons"
+  }
+}

balloons-and-static-electricity_en.html

@@ -1,30 +1,91 @@
-<!-- Copyright 2002-2013, University of Colorado -->
-
-<!-- Top-level HTML file for balloons-and-static-electricity. -->
 <!DOCTYPE HTML>
+<!-- Top-level HTML file for balloons-and-static-electricity generated by 'grunt generate-development-html' -->
 <html>
 <head>
   <meta charset="utf-8"/>
   <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+  <meta name="viewport" content="initial-scale=1,user-scalable=no,maximum-scale=1"/>
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="phet-sim-level" content="development">
+
+  <!-- Localized title with version will be filled in by JavaScript. -->
+  <title>Loading balloons-and-static-electricity</title>
+</head>
+<body bgcolor="black">
+<img id="splash" style="position: absolute;top: 50%;left: 50%;margin-top: -210px;margin-left: -252px;">
 
-  <!-- internationalized title will be inserted by sim -->
-  <title></title>
+<script type="text/javascript">
+  ( function() {
+    // Identify the brand (assume generated brand if not provided with query parameters)
+    var brandMatch = location.search.match( /brand=([^&]+)/ );
+    var brand = brandMatch ? decodeURIComponent( brandMatch[ 1 ] ) : 'phet';
 
-  <!-- jquery must be loaded here -->
-  <script type="text/javascript" src="../sherpa/jquery-2.1.0.js"></script>
-  <script type="text/javascript" src="../sherpa/lodash-2.4.1.js"></script>
-  <script type="text/javascript" src="../sherpa/has.js"></script>
-  <script type="text/javascript" src="../sherpa/FileSaver.js"></script>
+    // Load the desired splash screen image
+    document.getElementById( 'splash' ).src = '../brand/' + brand + '/images/splash.svg';
 
-  <!-- PhET common code that must be loaded pre-RequireJS -->
-  <script type="text/javascript" src="../phetcommon/js/util/query-parameters.js"></script>
-  <script type="text/javascript" src="../phetcommon/js/util/check-assertions.js"></script>
-  <script type="text/javascript" src="../phetcommon/js/util/check-accessibility.js"></script>
+    // Preloads, with more included for phet-io brands
+    var preloads = ( brand === 'phet-io' ) ? [ '../sherpa/lib/jquery-2.1.0.js', '../sherpa/lib/lodash-2.4.1.js', '../sherpa/lib/FileSaver-b8054a2.js', '../assert/js/assert.js', '../chipper/js/initialize-globals.js', '../sherpa/lib/seedrandom-2.4.2.js', '../sherpa/lib/jsondiffpatch-0.1.31.js', '../phet-io/js/phetio.js', '../phet-io/js/SimIFrameAPI.js', '../phet-io/js/phetioEvents.js', '../phet-io/js/datamite.js', '../phet-io/js/api/PhETIOCommon.js', '../phet-io/js/finishedPreloads.js' ] : [ '../sherpa/lib/jquery-2.1.0.js', '../sherpa/lib/lodash-2.4.1.js', '../sherpa/lib/FileSaver-b8054a2.js', '../assert/js/assert.js', '../chipper/js/initialize-globals.js', '../sherpa/lib/seedrandom-2.4.2.js' ];
 
-  <!-- sim -->
-  <script data-main="js/balloons-and-static-electricity-config.js" src="../sherpa/require-2.1.11.js"></script>
+    // Loads a synchronously-executed asynchronously-downloaded script tag, with optional data-main parameter.
+    // See http://www.html5rocks.com/en/tutorials/speed/script-loading/ for more about script loading. It helps to
+    // load all of the scripts with this method, so they are treated the same (and placed in the correct execution
+    // order).
+    function loadURL( preloadURL, main ) {
+      var script = document.createElement( 'script' );
+      if ( typeof main === 'string' ) {
+        script.setAttribute( 'data-main', main );
+      }
+      script.type = 'text/javascript';
+      script.src = preloadURL;
+      script.async = false;
+      document.head.appendChild( script );
+    }
 
-</head>
-<body>
+    // Queue all of the preloads to be loaded.
+    preloads.forEach( loadURL );
+
+    // This code is a near-duplicate in phet-io-launch.js
+    // See https://github.com/phetsims/phet-io/issues/181 for full details of the phet-io startup sequence
+
+    // This function launches the simulation by running the main require.js code
+    var launchSimulation = function() {
+
+      // Clean up the global namespace, if we polluted it.
+      if ( window.phetLaunchSimulation ) {
+        delete window.phetLaunchSimulation;
+      }
+
+      // Load the main require.js code for the simulation.
+      loadURL( '../sherpa/lib/require-2.1.11.js', 'js/balloons-and-static-electricity-config.js' );
+    };
+
+    // The ?phet-io.standalone query parameter will cause a phet-io simulation to launch, even without a wrapper "go-ahead" step
+    var standalone = window.location.search.slice( 1 ).split( '&' ).indexOf( 'phet-io.standalone' ) >= 0;
+
+    if ( brand !== 'phet-io' || standalone ) {
+
+      // Launch the simulation immediately
+      launchSimulation();
+    }
+    else {
+
+      // Wait for the wrapper to start up the sim, after it has finished pre-launch configuration.
+      // We cannot use the phet namespace yet since it does not yet exist.
+      if ( typeof window.phetLaunchSimulation !== 'undefined' ) {
+        throw new Error( 'window.phetLaunchSimulation was already defined' );
+      }
+      window.phetLaunchSimulation = launchSimulation;
+    }
+
+    // After phetLaunchSimulation has been assigned, start the rest of the launch sequence
+    // This calls onPhETiOInitialized
+    if ( brand === 'phet-io' ) {
+
+      // In phet-io requirejs mode, we must schedule the call to phetio.SimIFrameAPI.initialize() after
+      // all other preloads complete and after window.phetLaunchSimulation is assigned.
+      loadURL( '../phet-io/js/initializeSimIFrameAPI.js' );
+    }
+  })();
+</script>
 </body>
-</html>
+</html>

dependencies.json

@@ -0,0 +1,63 @@
+{
+  "comment": "# balloons-and-static-electricity 1.2.0-rc.1 Mon Feb 15 2016 16:27:25 GMT-0700 (Mountain Standard Time)",
+  "assert": {
+    "sha": "7d27130a4d27da15aa7f8a21bbfb9245288c1b44",
+    "branch": "master"
+  },
+  "axon": {
+    "sha": "60213ff7028991c5be284cf5f1d436739fe87f97",
+    "branch": "master"
+  },
+  "balloons-and-static-electricity": {
+    "sha": "8be47fd62d505264cb49835d227453d7b3850608",
+    "branch": "1.2"
+  },
+  "brand": {
+    "sha": "ac9ccaa74427844b170dcd1582f3e9bb931edef4",
+    "branch": "master"
+  },
+  "chipper": {
+    "sha": "62dbf3dee15ead3bad65773a62886585790e5cc1",
+    "branch": "master"
+  },
+  "dot": {
+    "sha": "da78031b6f080d20bc8346beaa1d37148188371e",
+    "branch": "master"
+  },
+  "joist": {
+    "sha": "03e28c2c65da16bce8b93bfa795cc426807958d3",
+    "branch": "master"
+  },
+  "kite": {
+    "sha": "10ca8bf2b2712307ff528352de8451c0c8afe093",
+    "branch": "master"
+  },
+  "phet-core": {
+    "sha": "c48bf32035dc5a4ed092ad611012fcbdeb5c6351",
+    "branch": "master"
+  },
+  "phetcommon": {
+    "sha": "35c2abc1378ec6a00435124922a360b721576a72",
+    "branch": "master"
+  },
+  "scenery": {
+    "sha": "f2a142e56d16506853e7e3f57365ed344674689a",
+    "branch": "master"
+  },
+  "scenery-phet": {
+    "sha": "e217d38e32263e17c0d0cd77a9e71969d626a0cc",
+    "branch": "master"
+  },
+  "sherpa": {
+    "sha": "bb68bbbc6e8e3ce98fc37a956f1e19fe8365c107",
+    "branch": "master"
+  },
+  "sun": {
+    "sha": "e2b9bd9b539b5602fc7e01b0a31a4c914b2d372e",
+    "branch": "master"
+  },
+  "tandem": {
+    "sha": "d0be78ddaf3bbbba746ecd7a4bf891fef99fc7ee",
+    "branch": "master"
+  }
+}

images/license.json

@@ -0,0 +1,34 @@
+{
+  "balloon-green.png": {
+    "text": [
+      "Copyright 2002-2015 University of Colorado Boulder"
+    ],
+    "projectURL": "http://phet.colorado.edu",
+    "license": "contact [email protected]",
+    "notes": "created by Noah Podolefsky or Sharon Siman-Tov"
+  },
+  "balloon-yellow.png": {
+    "text": [
+      "Copyright 2002-2015 University of Colorado Boulder"
+    ],
+    "projectURL": "http://phet.colorado.edu",
+    "license": "contact [email protected]",
+    "notes": "created by Noah Podolefsky or Sharon Siman-Tov"
+  },
+  "sweater.jpg": {
+    "text": [
+      "Copyright 2002-2015 University of Colorado Boulder"
+    ],
+    "projectURL": "http://phet.colorado.edu",
+    "license": "contact [email protected]",
+    "notes": ""
+  },
+  "wall.png": {
+    "text": [
+      "Copyright 2002-2015 University of Colorado Boulder"
+    ],
+    "projectURL": "http://phet.colorado.edu",
+    "license": "contact [email protected]",
+    "notes": ""
+  }
+}