From 217be7520d578b590ebfd58c975411b0b7a2582d Mon Sep 17 00:00:00 2001 From: Sam Reid Date: Fri, 6 Mar 2015 17:35:01 -0700 Subject: [PATCH] Added arch support for the remove solute button, see https://github.com/phetsims/concentration/issues/34 --- js/concentration-api-routes.js | 1 + js/concentration-api.js | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/js/concentration-api-routes.js b/js/concentration-api-routes.js index fff6f0c..a2ba412 100644 --- a/js/concentration-api-routes.js +++ b/js/concentration-api-routes.js @@ -11,6 +11,7 @@ define( function( require ) { // Mapping from Unique ID to the location in the code return { 'concentrationScreen.resetAllButton': 'concentrationScreen.view.resetAllButton', + 'concentrationScreen.removeSoluteButton': 'concentrationScreen.view.removeSoluteButton', 'concentrationScreen.solidRadioButton': 'concentrationScreen.view.soluteControls.soluteFormNode.shakerButton', 'concentrationScreen.solutionRadioButton': 'concentrationScreen.view.soluteControls.soluteFormNode.dropperButton', 'concentrationScreen.evaporationSlider': 'concentrationScreen.view.evaporationControl.slider', diff --git a/js/concentration-api.js b/js/concentration-api.js index ceee7d0..0742505 100644 --- a/js/concentration-api.js +++ b/js/concentration-api.js @@ -60,6 +60,16 @@ define( function( require ) { parent: Node // Also a special case }; + var RadioButton = { + name: 'RadioButton', + parent: 'Node' + }; + + var Slider = { + name: 'Slider', + parent: 'Node' + }; + // Use explicit names for id keys so they will match what researchers see in data files // Use id and type instead of componentID and typeID to simplify things for researchers // Use a map so that JS will help us check that there are no duplicate names. @@ -67,14 +77,17 @@ define( function( require ) { 'concentrationScreen.resetAllButton': { type: ResetAllButton }, + 'concentrationScreen.removeSoluteButton': { + type: Button + }, 'concentrationScreen.solidRadioButton': { - type: 'RadioButton' + type: RadioButton }, 'concentrationScreen.solutionRadioButton': { - type: 'RadioButton' + type: RadioButton }, 'concentrationScreen.evaporationSlider': { - type: 'Slider' + type: Slider }, 'concentrationScreen.drainFaucet': { type: Faucet