Skip to content

Commit a3e1b69

Browse files
committed
Fixed ui bug for switches
1 parent 57c7a95 commit a3e1b69

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

docs/src/app/components/pages/components/switches.jsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,7 @@ var SwitchesPage = React.createClass({
344344
id="toggleId1"
345345
name="toggleName1"
346346
value="toggleValue1"
347-
label="activate thrusters"
348-
onToggle={this._onToggle}/>
347+
label="activate thrusters"/>
349348
</div>
350349
<div className="switches-example-container">
351350
<Toggle
@@ -380,8 +379,7 @@ var SwitchesPage = React.createClass({
380379

381380
<RadioButtonGroup
382381
name="shipSpeed"
383-
defaultSelected="not_light"
384-
onChange={this._onRadioButtonClick}>
382+
defaultSelected="not_light">
385383
<RadioButton
386384
id="radioButtonId1"
387385
value="light"

src/js/checkbox.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ var Checkbox = React.createClass({
9191
},
9292

9393
_onCheck: function(e, isInputChecked) {
94-
if (!this.props.hasOwnProperty('checked')) this.setState({checked: !this.refs.enhancedSwitch.state.checked});
94+
if (!this.props.hasOwnProperty('checked')) this.setState({checked: isInputChecked});
9595
if (this.props.onCheck) this.props.onCheck(e, isInputChecked);
9696
},
9797

src/js/enhanced-switch.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ var EnhancedSwitch = React.createClass({
3434
(nextProps.defaultSwitched != this.props.defaultSwitched));
3535
var newState = {};
3636

37-
3837
if (hasCheckedProp) {
3938
newState.switched = nextProps.checked;
4039
} else if (hasCheckedLinkProp) {
@@ -95,7 +94,7 @@ var EnhancedSwitch = React.createClass({
9594

9695
_handleChange: function(e) {
9796
var isInputChecked = this.refs.checkbox.getDOMNode().checked;
98-
97+
9998
if (!this.props.hasOwnProperty('checked')) this.setState({switched: isInputChecked});
10099
if (this.props.onSwitch) this.props.onSwitch(e, isInputChecked);
101100
},

src/js/toggle.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ var Toggle = React.createClass({
9595
ref="enhancedSwitch"
9696
inputType="checkbox"
9797
onSwitch={this._onToggle}
98-
defaultSwitched={this.props.defaultToggled} />
98+
defaultChecked={this.props.defaultToggled} />
9999

100100
{divsInOrder}
101101

@@ -104,7 +104,7 @@ var Toggle = React.createClass({
104104
},
105105

106106
_onToggle: function(e, isInputChecked) {
107-
if (!this.props.hasOwnProperty('checked')) this.setState({toggled: !this.refs.enhancedSwitch.state.toggled});
107+
if (!this.props.hasOwnProperty('checked')) this.setState({toggled: isInputChecked});
108108
if (this.props.onToggle) this.props.onToggle(e, isInputChecked);
109109
},
110110

0 commit comments

Comments
 (0)