From 0d1548ef4571280b7b08e7877b1ccb9ed90298f2 Mon Sep 17 00:00:00 2001 From: Sam Reid Date: Fri, 6 Mar 2015 21:38:49 -0700 Subject: [PATCH] Fixed combo box button names, see https://github.com/phetsims/concentration/issues/34 --- js/concentration-api-routes.js | 14 +++++++------- js/concentration-api.js | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/concentration-api-routes.js b/js/concentration-api-routes.js index 4fe4eb6..0456601 100644 --- a/js/concentration-api-routes.js +++ b/js/concentration-api-routes.js @@ -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', diff --git a/js/concentration-api.js b/js/concentration-api.js index d759fed..cb83928 100644 --- a/js/concentration-api.js +++ b/js/concentration-api.js @@ -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 } }; } ); \ No newline at end of file