Merge branch 'master' of https://github.com/phetsims/molecule-polarity

.gitignore

@@ -8,4 +8,3 @@ node_modules/
 *.sublime-project
 *.sublime-workspace
 .eslintcache
-jsmol-14.2.4/

dependencies.json

@@ -1,5 +1,5 @@
 {
-  "comment": "# molecule-polarity 1.0.0-dev.17 Tue Jul 11 2017 11:06:22 GMT-0600 (MDT)",
+  "comment": "# molecule-polarity 1.0.0-dev.19 Thu Jul 13 2017 14:22:07 GMT-0600 (MDT)",
   "assert": {
     "sha": "5c3f92048a9c2ffd6df8ede54fd64f1f7a7e4ef2",
     "branch": "master"
@@ -13,23 +13,23 @@
     "branch": "master"
   },
   "chipper": {
-    "sha": "b9d822b6162b3a708f04793a5a6584f9b5b72af0",
+    "sha": "80ecc40f74a3f7dce27a53b93bc1a66f99394bbe",
     "branch": "master"
   },
   "dot": {
     "sha": "f7d9de8b5650a10126d3f8755a98cf64a0acc93c",
     "branch": "master"
   },
   "joist": {
-    "sha": "47e102010e984ef511787a4f10ffbc12de0b416b",
+    "sha": "0c9ef0232cebf55835db43985ae9cc3be4d63512",
     "branch": "master"
   },
   "kite": {
     "sha": "41ac3b7a27f0313bcafb9eb0fde1c1860a5c2cc6",
     "branch": "master"
   },
   "molecule-polarity": {
-    "sha": "532ef61ca9a796847bb4160fd4e8a070c87f0b72",
+    "sha": "439d4456d5707a0a31536053fe67b31289384de7",
     "branch": "master"
   },
   "nitroglycerin": {
@@ -49,7 +49,7 @@
     "branch": "master"
   },
   "scenery": {
-    "sha": "4d75499aa211d3663b885483496b3e218260f4dd",
+    "sha": "fb8d839ad268df6b16ef9a770fac8f61f75763f8",
     "branch": "master"
   },
   "scenery-phet": {
@@ -65,7 +65,7 @@
     "branch": "master"
   },
   "tandem": {
-    "sha": "492dc750b18fb8a672bee9793b520b2ed506800c",
+    "sha": "29cd4f635cd74ace76ffabc575ab92bef491b680",
     "branch": "master"
   }
 }

images/license.json

@@ -5,14 +5,14 @@
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact phethelp@colorado.edu",
-    "notes": "created using a screenshot from Real Molecules screen"
+    "notes": "created using a screenshot from Real Molecules screen in Java version"
   },
   "RealMolecules-navbar-icon.png": {
     "text": [
       "Copyright 2002-2015 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact phethelp@colorado.edu",
-    "notes": "created using a screenshot from Real Molecules screen"
+    "notes": "created using a screenshot from Real Molecules screen in Java version"
   }
 }

js/common/view/ElectronegativityControl.js

@@ -73,6 +73,8 @@ define( function( require ) {
       thumbNode: thumbNode,
       thumbYOffset: 10,
       trackSize: options.trackSize,
+      majorTickLength: 20,
+      minorTickLength: 10,
       startDrag: function() {
         molecule.dragging = true;
       },

js/realmolecules/view/RealMoleculesScreenView.js

@@ -33,6 +33,8 @@ define( function( require ) {
    */
   function RealMoleculesScreenView( model ) {
 
+    var self = this;
+
     ScreenView.call( this, MPConstants.SCREEN_VIEW_OPTIONS );
 
     // view-specific Properties
@@ -65,6 +67,7 @@ define( function( require ) {
     var controlPanel = new RealMoleculesControlPanel( viewProperties );
     var resetAllButton = new ResetAllButton( {
       listener: function() {
+        self.interruptSubtreeInput();
         model.reset();
         viewProperties.reset();
       },

js/realmolecules/view/UnderDevelopmentPlane.js

@@ -37,18 +37,27 @@ define( function( require ) {
       text: LEGACY_URL
     } );
 
+    var maxTextWidth = 0.75 * layoutBounds.width;
+
     var vBox = new VBox( {
       align: 'left',
       spacing: 20,
       children: [
-        new Text( underDevelopmentLine1String, { font: new PhetFont( 22 ) } ),
+        new Text( underDevelopmentLine1String, {
+          font: new PhetFont( 22 ),
+          maxWidth: maxTextWidth
+        } ),
         new VBox( {
           align: 'left',
           children: [
-            new Text( underDevelopmentLine2String, { font: new PhetFont( 16 ) } ),
+            new Text( underDevelopmentLine2String, {
+              font: new PhetFont( 16 ),
+              maxWidth: maxTextWidth
+            } ),
             new RichText( linkText, {
               links: true, // allow links in linkText
-              font: new PhetFont( 16 )
+              font: new PhetFont( 16 ),
+              maxWidth: maxTextWidth
             } )
           ]
         } )

js/threeatoms/view/MoleculeAngleArrowsNode.js → js/threeatoms/view/RotateArrowsNode.js

@@ -1,7 +1,7 @@
 // Copyright 2014-2017, University of Colorado Boulder
 
 /**
- * A pair of arrows that are placed around an atom, indicating that dragging the atom will change the molecule angle.
+ * A pair of arrows used to indicate that an arrow can be rotated.
  * Shapes are created in global coordinates, so this node's location should be (0,0).
  *
  * @author Chris Malley (PixelZoom, Inc.)
@@ -22,7 +22,7 @@ define( function( require ) {
    * @param {Atom} atom
    * @constructor
    */
-  function MoleculeAngleArrowsNode( molecule, atom ) {
+  function RotateArrowsNode( molecule, atom ) {
 
     // arrow configuration
     var arrowShapeOptions = { headWidth: 20, headHeight: 20, tailWidth: 10 };
@@ -47,7 +47,7 @@ define( function( require ) {
     atom.locationProperty.link( updateTransform.bind( this ) ); // unlink not needed
   }
 
-  moleculePolarity.register( 'MoleculeAngleArrowsNode', MoleculeAngleArrowsNode );
+  moleculePolarity.register( 'RotateArrowsNode', RotateArrowsNode );
 
-  return inherit( Node, MoleculeAngleArrowsNode );
+  return inherit( Node, RotateArrowsNode );
 } );

js/threeatoms/view/ThreeAtomsScreenView.js

@@ -27,6 +27,8 @@ define( function( require ) {
    */
   function ThreeAtomsScreenView( model ) {
 
+    var self = this;
+
     ScreenView.call( this, MPConstants.SCREEN_VIEW_OPTIONS );
 
     // view-specific Properties
@@ -42,6 +44,7 @@ define( function( require ) {
     var controlPanel = new ThreeAtomsControlPanel( viewProperties, model.eField.enabledProperty );
     var resetAllButton = new ResetAllButton( {
       listener: function() {
+        self.interruptSubtreeInput();
         model.reset();
         viewProperties.reset();
       },

js/threeatoms/view/BondAngleArrowsNode.js → js/threeatoms/view/TranslateArrowsNode.js

@@ -1,7 +1,7 @@
 // Copyright 2014-2017, University of Colorado Boulder
 
 /**
- * A pair of arrows that are placed around an atom, indicating that dragging the atom will change the bond angle.
+ * A pair of arrows that are placed around an atom to indicate that the atom can be translated.
  * Shapes are created in global coordinates, so this node's location should be (0,0).
  *
  * @author Chris Malley (PixelZoom, Inc.)
@@ -24,7 +24,7 @@ define( function( require ) {
    * @param {Object} [options]
    * @constructor
    */
-  function BondAngleArrowsNode( molecule, atom, options ) {
+  function TranslateArrowsNode( molecule, atom, options ) {
 
     options = _.extend( {
       length: 25 // relatively short, so we don't need curved arrows
@@ -56,7 +56,7 @@ define( function( require ) {
     Node.call( this, options );
   }
 
-  moleculePolarity.register( 'BondAngleArrowsNode', BondAngleArrowsNode );
+  moleculePolarity.register( 'TranslateArrowsNode', TranslateArrowsNode );
 
-  return inherit( Node, BondAngleArrowsNode );
+  return inherit( Node, TranslateArrowsNode );
 } );

js/threeatoms/view/TriatomicMoleculeNode.js

@@ -12,17 +12,17 @@ define( function( require ) {
   // import
   var ArrowsHandler = require( 'MOLECULE_POLARITY/threeatoms/view/ArrowsHandler' );
   var AtomNode = require( 'MOLECULE_POLARITY/common/view/AtomNode' );
-  var BondAngleArrowsNode = require( 'MOLECULE_POLARITY/threeatoms/view/BondAngleArrowsNode' );
   var BondAngleHandler = require( 'MOLECULE_POLARITY/threeatoms/view/BondAngleHandler' );
   var BondDipoleNode = require( 'MOLECULE_POLARITY/common/view/BondDipoleNode' );
   var BondNode = require( 'MOLECULE_POLARITY/common/view/BondNode' );
   var inherit = require( 'PHET_CORE/inherit' );
   var MolecularDipoleNode = require( 'MOLECULE_POLARITY/common/view/MolecularDipoleNode' );
-  var MoleculeAngleArrowsNode = require( 'MOLECULE_POLARITY/threeatoms/view/MoleculeAngleArrowsNode' );
+  var RotateArrowsNode = require( 'MOLECULE_POLARITY/threeatoms/view/RotateArrowsNode' );
   var MoleculeAngleHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleHandler' );
   var moleculePolarity = require( 'MOLECULE_POLARITY/moleculePolarity' );
   var Node = require( 'SCENERY/nodes/Node' );
   var PartialChargeNode = require( 'MOLECULE_POLARITY/common/view/PartialChargeNode' );
+  var TranslateArrowsNode = require( 'MOLECULE_POLARITY/threeatoms/view/TranslateArrowsNode' );
 
   /**
    * @param {TriatomicMolecule} molecule
@@ -38,9 +38,9 @@ define( function( require ) {
     var atomANode = new AtomNode( molecule.atomA );
     var atomBNode = new AtomNode( molecule.atomB );
     var atomCNode = new AtomNode( molecule.atomC );
-    var arrowsANode = new BondAngleArrowsNode( molecule, molecule.atomA );
-    var arrowsCNode = new BondAngleArrowsNode( molecule, molecule.atomC );
-    var arrowsBNode = new MoleculeAngleArrowsNode( molecule, molecule.atomB );
+    var arrowsANode = new TranslateArrowsNode( molecule, molecule.atomA );
+    var arrowsCNode = new TranslateArrowsNode( molecule, molecule.atomC );
+    var arrowsBNode = new RotateArrowsNode( molecule, molecule.atomB );
 
     // @private nodes whose visibility may change
     this.partialChargeNodeA = PartialChargeNode.createOppositePartialChargeNode( molecule.atomA, molecule.bondAB );

js/twoatoms/view/DiatomicMoleculeNode.js

@@ -17,12 +17,12 @@ define( function( require ) {
   var ElectronDensityNode = require( 'MOLECULE_POLARITY/twoatoms/view/ElectronDensityNode' );
   var ElectrostaticPotentialNode = require( 'MOLECULE_POLARITY/twoatoms/view/ElectrostaticPotentialNode' );
   var inherit = require( 'PHET_CORE/inherit' );
-  var MoleculeAngleArrowsNode = require( 'MOLECULE_POLARITY/threeatoms/view/MoleculeAngleArrowsNode' );
   var MoleculeAngleHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleHandler' );
   var moleculePolarity = require( 'MOLECULE_POLARITY/moleculePolarity' );
   var Node = require( 'SCENERY/nodes/Node' );
   var PartialChargeNode = require( 'MOLECULE_POLARITY/common/view/PartialChargeNode' );
   var SurfaceType = require( 'MOLECULE_POLARITY/common/view/SurfaceType' );
+  var TranslateArrowsNode = require( 'MOLECULE_POLARITY/threeatoms/view/TranslateArrowsNode' );
 
   /**
    * @param {DiatomicMolecule} molecule
@@ -34,8 +34,8 @@ define( function( require ) {
     var atomANode = new AtomNode( molecule.atomA );
     var atomBNode = new AtomNode( molecule.atomB );
     var bondNode = new BondNode( molecule.bond );
-    var arrowsANode = new MoleculeAngleArrowsNode( molecule, molecule.atomA );
-    var arrowsBNode = new MoleculeAngleArrowsNode( molecule, molecule.atomB );
+    var arrowsANode = new TranslateArrowsNode( molecule, molecule.atomA );
+    var arrowsBNode = new TranslateArrowsNode( molecule, molecule.atomB );
 
     // @private nodes whose visibility may change
     this.partialChargeNodeA = PartialChargeNode.createOppositePartialChargeNode( molecule.atomA, molecule.bond ); // @private

js/twoatoms/view/TwoAtomsScreenView.js

@@ -30,6 +30,8 @@ define( function( require ) {
    */
   function TwoAtomsScreenView( model ) {
 
+    var self = this;
+
     ScreenView.call( this, MPConstants.SCREEN_VIEW_OPTIONS );
 
     // view-specific Properties
@@ -47,6 +49,7 @@ define( function( require ) {
     var controlPanel = new TwoAtomsControlPanel( viewProperties, model.eField.enabledProperty );
     var resetAllButton = new ResetAllButton( {
       listener: function() {
+        self.interruptSubtreeInput();
         model.reset();
         viewProperties.reset();
       },

molecule-polarity-strings_en.json

@@ -66,7 +66,7 @@
     "value": "{{symbol}} ({{name}})"
   },
   "none": {
-    "value": "none"
+    "value": "None"
   },
   "electrostaticPotential": {
     "value": "Electrostatic Potential"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "molecule-polarity",
-  "version": "1.0.0-dev.17",
+  "version": "1.0.0-dev.19",
   "license": "GPL-3.0",
   "repository": {
     "type": "git",