Skip to content

Commit

Permalink
Fixed combo box button names, see #34
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Mar 7, 2015
1 parent f5786eb commit 0d1548e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions js/concentration-api-routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ define( function( require ) {
// TODO: Could be confusing here to refer to the button of the combobox as the combo box
'concentrationScreen.soluteComboBox': 'concentrationScreen.view.soluteControls.soluteComboBox.buttonNode',
'concentrationScreen.soluteComboBox.drinkMixButton': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.drinkMix',
'concentrationScreen.soluteComboBox.cobaltIINitrate': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.cobaltIINitrate',
'concentrationScreen.soluteComboBox.cobaltChloride': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.cobaltChloride',
'concentrationScreen.soluteComboBox.potassiumDichromate': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.potassiumDichromate',
'concentrationScreen.soluteComboBox.potassiumChromate': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.potassiumChromate',
'concentrationScreen.soluteComboBox.nickelIIChloride': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.nickelIIChloride',
'concentrationScreen.soluteComboBox.copperSulfate': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.copperSulfate',
'concentrationScreen.soluteComboBox.potassiumPermanganate': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.potassiumPermanganate',
'concentrationScreen.soluteComboBox.cobaltIINitrateButton': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.cobaltIINitrate',
'concentrationScreen.soluteComboBox.cobaltChlorideButton': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.cobaltChloride',
'concentrationScreen.soluteComboBox.potassiumDichromateButton': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.potassiumDichromate',
'concentrationScreen.soluteComboBox.potassiumChromateButton': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.potassiumChromate',
'concentrationScreen.soluteComboBox.nickelIIChlorideButton': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.nickelIIChloride',
'concentrationScreen.soluteComboBox.copperSulfateButton': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.copperSulfate',
'concentrationScreen.soluteComboBox.potassiumPermanganateButton': 'concentrationScreen.view.soluteControls.soluteComboBox.itemNodeList.potassiumPermanganate',

'concentrationScreen.soluteForm': 'concentrationScreen.view.soluteControls.soluteFormNode.soluteFormProperty',

Expand Down
14 changes: 7 additions & 7 deletions js/concentration-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ define( function( require ) {
'concentrationScreen.soluteComboBox.drinkMixButton': {
type: ComboBoxButton
},
'concentrationScreen.soluteComboBox.cobaltIINitrate': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.cobaltChloride': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.potassiumDichromate': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.potassiumChromate': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.nickelIIChloride': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.copperSulfate': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.potassiumPermanganate': { type: ComboBoxButton }
'concentrationScreen.soluteComboBox.cobaltIINitrateButton': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.cobaltChlorideButton': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.potassiumDichromateButton': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.potassiumChromateButton': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.nickelIIChlorideButton': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.copperSulfateButton': { type: ComboBoxButton },
'concentrationScreen.soluteComboBox.potassiumPermanganateButton': { type: ComboBoxButton }
};
} );

0 comments on commit 0d1548e

Please sign in to comment.