Merge remote-tracking branch 'origin/master'

phetsims · Dec 18, 2018 · 4697117 · 4697117
2 parents 457563b + 4aafa58
commit 4697117
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/js/resistance-in-a-wire/ResistanceInAWireA11yStrings.js b/js/resistance-in-a-wire/ResistanceInAWireA11yStrings.js
@@ -17,7 +17,7 @@ define( function( require ) {
     summarySimString: { 
       value: 'In the Play Area you find the Resistance equation, <b>R</b> equals <b>rho</b> times <b>L</b> over <b>A</b>, and a piece of wire. ' +
              'Sliders for resistivity, length, and area allow changes to the equation and the piece of wire. ' +
-             'The Control Panel has a button to reset the sim.'
+             'The Control Area has a button to reset the sim.'
     },
     currentlyString: {
       value: 'Currently,'

diff --git a/js/resistance-in-a-wire/view/ResistanceInAWireScreenView.js b/js/resistance-in-a-wire/view/ResistanceInAWireScreenView.js
@@ -29,7 +29,7 @@ define( function( require ) {
 
   // a11y strings
   var playAreaString = JoistA11yStrings.playArea.value;
-  var controlPanelString = JoistA11yStrings.controlPanel.value;
+  var controlAreaString = JoistA11yStrings.controlArea.value;
 
   /**
    * @param {ResistanceInAWireModel} model
@@ -54,7 +54,7 @@ define( function( require ) {
     this.addChild( a11yPlayAreaNode );
 
     // a11y - the control panel for this sim, containing supplemental controls
-    var a11yControlPanelNode = new AccessibleSectionNode( controlPanelString );
+    var a11yControlPanelNode = new AccessibleSectionNode( controlAreaString );
     this.addChild( a11yControlPanelNode );
 
     // Create the control panel with sliders that change the values of the equation's variables. Hard coded
@@ -110,7 +110,7 @@ define( function( require ) {
     // resistance letter grows too large
     var highlightShape = resetAllButton.focusHighlight;
     assert && assert( highlightShape instanceof Shape, 'highlightShape must be a Shape' );
-    resetAllButton.focusHighlight = new FocusHighlightPath( highlightShape , { outerStroke: 'black' } );
+    resetAllButton.focusHighlight = new FocusHighlightPath( highlightShape, { outerStroke: 'black' } );
 
     // add the control panel last so it is always on top.
     a11yPlayAreaNode.addChild( controlPanel );