From 0c96906bffb178e621d43f175cb2be5bd0b2d313 Mon Sep 17 00:00:00 2001
From: zepumph <michael.kauzmann@colorado.edu>
Date: Sun, 8 Apr 2018 10:44:18 -0800
Subject: [PATCH] molecules-and-light regression,
 https://github.com/phetsims/scenery/issues/753

---
 js/moleculesandlight/view/MoleculeSelectionPanel.js       | 3 +--
 js/moleculesandlight/view/MoleculesAndLightScreenView.js  | 4 +++-
 js/moleculesandlight/view/ObservationWindow.js            | 8 +++-----
 .../view/QuadEmissionFrequencyControlPanel.js             | 3 +--
 js/moleculesandlight/view/SpectrumWindowDialog.js         | 3 +--
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/js/moleculesandlight/view/MoleculeSelectionPanel.js b/js/moleculesandlight/view/MoleculeSelectionPanel.js
index cb587701..0600bfdf 100644
--- a/js/moleculesandlight/view/MoleculeSelectionPanel.js
+++ b/js/moleculesandlight/view/MoleculeSelectionPanel.js
@@ -225,8 +225,7 @@ define( function( require ) {
       tagName: 'div',
       labelTagName: 'h3',
       labelContent: moleculesString,
-      descriptionContent: moleculesPanelDescriptionString,
-      prependLabels: true
+      descriptionContent: moleculesPanelDescriptionString
     } );
   }
 
diff --git a/js/moleculesandlight/view/MoleculesAndLightScreenView.js b/js/moleculesandlight/view/MoleculesAndLightScreenView.js
index 43968044..509aa79f 100644
--- a/js/moleculesandlight/view/MoleculesAndLightScreenView.js
+++ b/js/moleculesandlight/view/MoleculesAndLightScreenView.js
@@ -169,7 +169,8 @@ define( function( require ) {
 
       // a11y
       innerContent: stepButtonLabelString,
-      descriptionContent: stepButtonDescriptionString
+      descriptionContent: stepButtonDescriptionString,
+      appendDescription: true
     } );
     controlPanelSectionNode.addChild( stepButton );
 
@@ -210,6 +211,7 @@ define( function( require ) {
       // a11y
       innerContent: spectrumButtonLabelString,
       descriptionContent: spectrumButtonDescriptionString,
+      appendDescription: true,
       containerTagName: 'div'
     } );
 
diff --git a/js/moleculesandlight/view/ObservationWindow.js b/js/moleculesandlight/view/ObservationWindow.js
index e902294d..32a95590 100644
--- a/js/moleculesandlight/view/ObservationWindow.js
+++ b/js/moleculesandlight/view/ObservationWindow.js
@@ -27,7 +27,7 @@ define( function( require ) {
   var StringUtils = require( 'PHETCOMMON/util/StringUtils' );
   var Text = require( 'SCENERY/nodes/Text' );
   var PhotonTarget = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/PhotonTarget' );
-  var WavelengthConstants = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/WavelengthConstants');
+  var WavelengthConstants = require( 'MOLECULES_AND_LIGHT/photon-absorption/model/WavelengthConstants' );
   var Vector2 = require( 'DOT/Vector2' );
 
   // phet-io modules
@@ -88,8 +88,7 @@ define( function( require ) {
       // a11y
       tagName: 'div',
       labelTagName: 'h3',
-      labelContent: 'Observation Window',
-      prependLabels: true
+      labelContent: 'Observation Window'
     } );
 
     var self = this;
@@ -169,9 +168,8 @@ define( function( require ) {
       tandem: tandem.createTandem( 'returnMoleculeButton' ),
 
       // a11y
-      tagName: 'input',
-      inputType: 'button',
       descriptionContent: returnMoleculeHelpString,
+      appendDescription: true,
       ariaLabel: returnMoleculeString
     } );
 
diff --git a/js/moleculesandlight/view/QuadEmissionFrequencyControlPanel.js b/js/moleculesandlight/view/QuadEmissionFrequencyControlPanel.js
index 0cdb467e..70eff51f 100644
--- a/js/moleculesandlight/view/QuadEmissionFrequencyControlPanel.js
+++ b/js/moleculesandlight/view/QuadEmissionFrequencyControlPanel.js
@@ -72,8 +72,7 @@ define( function( require ) {
       tagName: 'div',
       labelTagName: 'h3',
       labelContent: lightSourceString,
-      descriptionContent: lightSourceDescriptionString,
-      prependLabels: true
+      descriptionContent: lightSourceDescriptionString
     } );
 
     // Initialize the photon nodes for the control panel.  Identity model view transform is used because these photon
diff --git a/js/moleculesandlight/view/SpectrumWindowDialog.js b/js/moleculesandlight/view/SpectrumWindowDialog.js
index 0e240a9b..2d631555 100644
--- a/js/moleculesandlight/view/SpectrumWindowDialog.js
+++ b/js/moleculesandlight/view/SpectrumWindowDialog.js
@@ -62,8 +62,7 @@ define( function( require ) {
 
       // a11y
       tagName: 'p',
-      descriptionContent: spectrumWindowDescriptionString,
-      prependLabels: true
+      descriptionContent: spectrumWindowDescriptionString
     } );
 
     // close it on a click