Skip to content

Commit

Permalink
Added arch support for the remove solute button, see #34
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Mar 7, 2015
1 parent f6130b7 commit 217be75
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
1 change: 1 addition & 0 deletions js/concentration-api-routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
19 changes: 16 additions & 3 deletions js/concentration-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,34 @@ 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.
return {
'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
Expand Down

0 comments on commit 217be75

Please sign in to comment.