From 1545d67b5649d011b3f6bf56d9984e4a9c126d4e Mon Sep 17 00:00:00 2001 From: Chris Malley Date: Thu, 13 Jul 2017 15:25:31 -0600 Subject: [PATCH] rename drag handlers, #45 --- ...AngleHandler.js => MoleculeAngleDragHandler.js} | 6 +++--- ...BondAngleHandler.js => BondAngleDragHandler.js} | 6 +++--- js/threeatoms/view/TriatomicMoleculeNode.js | 14 +++++++------- js/twoatoms/view/DiatomicMoleculeNode.js | 4 ++-- js/twoatoms/view/ElectronDensityNode.js | 4 ++-- js/twoatoms/view/ElectrostaticPotentialNode.js | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) rename js/common/view/{MoleculeAngleHandler.js => MoleculeAngleDragHandler.js} (87%) rename js/threeatoms/view/{BondAngleHandler.js => BondAngleDragHandler.js} (89%) diff --git a/js/common/view/MoleculeAngleHandler.js b/js/common/view/MoleculeAngleDragHandler.js similarity index 87% rename from js/common/view/MoleculeAngleHandler.js rename to js/common/view/MoleculeAngleDragHandler.js index 60237d59..d9b0333d 100644 --- a/js/common/view/MoleculeAngleHandler.js +++ b/js/common/view/MoleculeAngleDragHandler.js @@ -18,7 +18,7 @@ define( function( require ) { * @param {Node} relativeNode - angles are computed relative to this Node * @constructor */ - function MoleculeAngleHandler( molecule, relativeNode ) { + function MoleculeAngleDragHandler( molecule, relativeNode ) { var previousAngle; // angle between the pointer and the molecule when the drag started @@ -53,7 +53,7 @@ define( function( require ) { } ); } - moleculePolarity.register( 'MoleculeAngleHandler', MoleculeAngleHandler ); + moleculePolarity.register( 'MoleculeAngleDragHandler', MoleculeAngleDragHandler ); - return inherit( SimpleDragHandler, MoleculeAngleHandler ); + return inherit( SimpleDragHandler, MoleculeAngleDragHandler ); } ); diff --git a/js/threeatoms/view/BondAngleHandler.js b/js/threeatoms/view/BondAngleDragHandler.js similarity index 89% rename from js/threeatoms/view/BondAngleHandler.js rename to js/threeatoms/view/BondAngleDragHandler.js index 799dd6db..ea2d887b 100644 --- a/js/threeatoms/view/BondAngleHandler.js +++ b/js/threeatoms/view/BondAngleDragHandler.js @@ -22,7 +22,7 @@ define( function( require ) { * @param {Property.} bondAngleProperty - Property that this handler modifies * @constructor */ - function BondAngleHandler( molecule, bondAngleProperty ) { + function BondAngleDragHandler( molecule, bondAngleProperty ) { var previousAngle = 0; @@ -58,7 +58,7 @@ define( function( require ) { } ); } - moleculePolarity.register( 'BondAngleHandler', BondAngleHandler ); + moleculePolarity.register( 'BondAngleDragHandler', BondAngleDragHandler ); - return inherit( SimpleDragHandler, BondAngleHandler ); + return inherit( SimpleDragHandler, BondAngleDragHandler ); } ); \ No newline at end of file diff --git a/js/threeatoms/view/TriatomicMoleculeNode.js b/js/threeatoms/view/TriatomicMoleculeNode.js index df21b155..7f13b549 100644 --- a/js/threeatoms/view/TriatomicMoleculeNode.js +++ b/js/threeatoms/view/TriatomicMoleculeNode.js @@ -12,13 +12,13 @@ define( function( require ) { // import var ArrowsHandler = require( 'MOLECULE_POLARITY/threeatoms/view/ArrowsHandler' ); var AtomNode = require( 'MOLECULE_POLARITY/common/view/AtomNode' ); - var BondAngleHandler = require( 'MOLECULE_POLARITY/threeatoms/view/BondAngleHandler' ); + var BondAngleDragHandler = require( 'MOLECULE_POLARITY/threeatoms/view/BondAngleDragHandler' ); 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 RotateArrowsNode = require( 'MOLECULE_POLARITY/threeatoms/view/RotateArrowsNode' ); - var MoleculeAngleHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleHandler' ); + var MoleculeAngleDragHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleDragHandler' ); var moleculePolarity = require( 'MOLECULE_POLARITY/moleculePolarity' ); var Node = require( 'SCENERY/nodes/Node' ); var PartialChargeNode = require( 'MOLECULE_POLARITY/common/view/PartialChargeNode' ); @@ -63,14 +63,14 @@ define( function( require ) { // rotate molecule by dragging bonds or atom B bondABNode.cursor = bondBCNode.cursor = atomBNode.cursor = 'pointer'; - bondABNode.addInputListener( new MoleculeAngleHandler( molecule, this ) ); - bondBCNode.addInputListener( new MoleculeAngleHandler( molecule, this ) ); - atomBNode.addInputListener( new MoleculeAngleHandler( molecule, this ) ); + bondABNode.addInputListener( new MoleculeAngleDragHandler( molecule, this ) ); + bondBCNode.addInputListener( new MoleculeAngleDragHandler( molecule, this ) ); + atomBNode.addInputListener( new MoleculeAngleDragHandler( molecule, this ) ); // change bond angles by dragging atom A or C atomANode.cursor = atomCNode.cursor = 'pointer'; - atomANode.addInputListener( new BondAngleHandler( molecule, molecule.bondAngleAProperty ) ); - atomCNode.addInputListener( new BondAngleHandler( molecule, molecule.bondAngleCProperty ) ); + atomANode.addInputListener( new BondAngleDragHandler( molecule, molecule.bondAngleAProperty ) ); + atomCNode.addInputListener( new BondAngleDragHandler( molecule, molecule.bondAngleCProperty ) ); // arrows that act as interactivity cues atomANode.addInputListener( new ArrowsHandler( arrowsANode ) ); diff --git a/js/twoatoms/view/DiatomicMoleculeNode.js b/js/twoatoms/view/DiatomicMoleculeNode.js index d352d497..b49d6204 100644 --- a/js/twoatoms/view/DiatomicMoleculeNode.js +++ b/js/twoatoms/view/DiatomicMoleculeNode.js @@ -17,7 +17,7 @@ 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 MoleculeAngleHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleHandler' ); + var MoleculeAngleDragHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleDragHandler' ); var moleculePolarity = require( 'MOLECULE_POLARITY/moleculePolarity' ); var Node = require( 'SCENERY/nodes/Node' ); var PartialChargeNode = require( 'MOLECULE_POLARITY/common/view/PartialChargeNode' ); @@ -56,7 +56,7 @@ define( function( require ) { // rotate molecule by dragging anywhere this.cursor = 'pointer'; - this.addInputListener( new MoleculeAngleHandler( molecule, this ) ); + this.addInputListener( new MoleculeAngleDragHandler( molecule, this ) ); // arrows that act as interactivity cues atomANode.addInputListener( new ArrowsHandler( arrowsANode ) ); diff --git a/js/twoatoms/view/ElectronDensityNode.js b/js/twoatoms/view/ElectronDensityNode.js index 0c64e111..0bbfc6aa 100644 --- a/js/twoatoms/view/ElectronDensityNode.js +++ b/js/twoatoms/view/ElectronDensityNode.js @@ -14,7 +14,7 @@ define( function( require ) { // modules var inherit = require( 'PHET_CORE/inherit' ); var LinearGradient = require( 'SCENERY/util/LinearGradient' ); - var MoleculeAngleHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleHandler' ); + var MoleculeAngleDragHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleDragHandler' ); var moleculePolarity = require( 'MOLECULE_POLARITY/moleculePolarity' ); var MPColors = require( 'MOLECULE_POLARITY/common/MPColors' ); var MPConstants = require( 'MOLECULE_POLARITY/common/MPConstants' ); @@ -72,7 +72,7 @@ define( function( require ) { } ); this.cursor = 'pointer'; - this.addInputListener( new MoleculeAngleHandler( molecule, this ) ); + this.addInputListener( new MoleculeAngleDragHandler( molecule, this ) ); } moleculePolarity.register( 'ElectronDensityNode', ElectronDensityNode ); diff --git a/js/twoatoms/view/ElectrostaticPotentialNode.js b/js/twoatoms/view/ElectrostaticPotentialNode.js index 23ca0ea2..6d08350b 100644 --- a/js/twoatoms/view/ElectrostaticPotentialNode.js +++ b/js/twoatoms/view/ElectrostaticPotentialNode.js @@ -14,7 +14,7 @@ define( function( require ) { // modules var inherit = require( 'PHET_CORE/inherit' ); var LinearGradient = require( 'SCENERY/util/LinearGradient' ); - var MoleculeAngleHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleHandler' ); + var MoleculeAngleDragHandler = require( 'MOLECULE_POLARITY/common/view/MoleculeAngleDragHandler' ); var moleculePolarity = require( 'MOLECULE_POLARITY/moleculePolarity' ); var MPColors = require( 'MOLECULE_POLARITY/common/MPColors' ); var MPConstants = require( 'MOLECULE_POLARITY/common/MPConstants' ); @@ -72,7 +72,7 @@ define( function( require ) { } ); this.cursor = 'pointer'; - this.addInputListener( new MoleculeAngleHandler( molecule, this ) ); + this.addInputListener( new MoleculeAngleDragHandler( molecule, this ) ); } moleculePolarity.register( 'ElectrostaticPotentialNode', ElectrostaticPotentialNode );