Merge pull request #279 from mmrtnz/master

Fixed ui bug for switches
mui · Jan 27, 2015 · 7e9f069 · 7e9f069
2 parents 57c7a95 + a3e1b69
commit 7e9f069
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/docs/src/app/components/pages/components/switches.jsx b/docs/src/app/components/pages/components/switches.jsx
@@ -344,8 +344,7 @@ var SwitchesPage = React.createClass({
             id="toggleId1"
             name="toggleName1"
             value="toggleValue1"
-            label="activate thrusters" 
-            onToggle={this._onToggle}/>
+            label="activate thrusters"/>
         </div>
         <div className="switches-example-container">
           <Toggle
@@ -380,8 +379,7 @@ var SwitchesPage = React.createClass({
 
         <RadioButtonGroup 
           name="shipSpeed"
-          defaultSelected="not_light"
-          onChange={this._onRadioButtonClick}>
+          defaultSelected="not_light">
             <RadioButton
               id="radioButtonId1"
               value="light"

diff --git a/src/js/checkbox.jsx b/src/js/checkbox.jsx
@@ -91,7 +91,7 @@ var Checkbox = React.createClass({
   },
 
   _onCheck: function(e, isInputChecked) {
-    if (!this.props.hasOwnProperty('checked')) this.setState({checked: !this.refs.enhancedSwitch.state.checked});
+    if (!this.props.hasOwnProperty('checked')) this.setState({checked: isInputChecked});
     if (this.props.onCheck) this.props.onCheck(e, isInputChecked);
   },
 

diff --git a/src/js/enhanced-switch.jsx b/src/js/enhanced-switch.jsx
@@ -34,7 +34,6 @@ var EnhancedSwitch = React.createClass({
       (nextProps.defaultSwitched != this.props.defaultSwitched));
     var newState = {};
 
-
     if (hasCheckedProp) {
       newState.switched = nextProps.checked;
     } else if (hasCheckedLinkProp) {
@@ -95,7 +94,7 @@ var EnhancedSwitch = React.createClass({
 
   _handleChange: function(e) {
     var isInputChecked = this.refs.checkbox.getDOMNode().checked;
-
+    
     if (!this.props.hasOwnProperty('checked')) this.setState({switched: isInputChecked});
     if (this.props.onSwitch) this.props.onSwitch(e, isInputChecked);
   },

diff --git a/src/js/toggle.jsx b/src/js/toggle.jsx
@@ -95,7 +95,7 @@ var Toggle = React.createClass({
           ref="enhancedSwitch"
           inputType="checkbox"
           onSwitch={this._onToggle}
-          defaultSwitched={this.props.defaultToggled} />
+          defaultChecked={this.props.defaultToggled} />
 
         {divsInOrder}
 
@@ -104,7 +104,7 @@ var Toggle = React.createClass({
   },
 
   _onToggle: function(e, isInputChecked) {
-    if (!this.props.hasOwnProperty('checked')) this.setState({toggled: !this.refs.enhancedSwitch.state.toggled});
+    if (!this.props.hasOwnProperty('checked')) this.setState({toggled: isInputChecked});
     if (this.props.onToggle) this.props.onToggle(e, isInputChecked);
   },