Skip to content

Commit

Permalink
Correção da issue luqin#43 e atualização da versão do React
Browse files Browse the repository at this point in the history
  • Loading branch information
Ricardo Glodzinski committed Mar 2, 2018
1 parent 497f5d7 commit 55f694b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 25 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ $RECYCLE.BIN/

.publish/
examples/dist/

yarn.lock
6 changes: 0 additions & 6 deletions lib/EnhancedSwitch.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ var EnhancedSwitch = (function (_React$Component) {
// increase clickable area by given % (negative number to decrease)
increaseArea: _propTypes2['default'].string,

// true to set 'pointer' CSS cursor over enabled inputs and 'default' over disabled
cursor: _propTypes2['default'].bool,

// set true to inherit original input's class name
inheritClass: _propTypes2['default'].bool,

Expand Down Expand Up @@ -179,9 +176,6 @@ var EnhancedSwitch = (function (_React$Component) {
// increase clickable area by given % (negative number to decrease)
increaseArea: '',

// true to set 'pointer' CSS cursor over enabled inputs and 'default' over disabled
cursor: false,

// set true to inherit original input's class name
inheritClass: false,

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
"eslint-config-onefe": "0.2.0",
"eslint-plugin-react": "^3.11.3",
"gulp": "^3.9.1",
"react": "^15.4.2",
"react-dom": "15.3.2",
"react-bootstrap": "^0.30.3",
"react": "^16.2.0",
"react-bootstrap": "^0.32.1",
"react-component-tools": "^1.0.2",
"react-router": "^2.8.1",
"react-dom": "^16.2.0",
"react-router": "^4.2.0",
"react-router-bootstrap": "^0.22.1",
"react-router-loader": "^0.5.4",
"webpack": "1.13.0",
Expand Down
24 changes: 9 additions & 15 deletions src/EnhancedSwitch.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,6 @@ class EnhancedSwitch extends React.Component {
// increase clickable area by given % (negative number to decrease)
increaseArea: PropTypes.string,

// true to set 'pointer' CSS cursor over enabled inputs and 'default' over disabled
cursor: PropTypes.bool,

// set true to inherit original input's class name
inheritClass: PropTypes.bool,

Expand Down Expand Up @@ -144,9 +141,6 @@ class EnhancedSwitch extends React.Component {
// increase clickable area by given % (negative number to decrease)
increaseArea: '',

// true to set 'pointer' CSS cursor over enabled inputs and 'default' over disabled
cursor: false,

// set true to inherit original input's class name
inheritClass: false,

Expand Down Expand Up @@ -423,8 +417,8 @@ class EnhancedSwitch extends React.Component {
helper = (
<ins
className={_iCheckHelper}
style={ layer}
onClick={ this.handleHelperClick.bind(this)}
style={layer}
onClick={this.handleHelperClick.bind(this)}
/>
);

Expand All @@ -433,14 +427,14 @@ class EnhancedSwitch extends React.Component {
{...other}

ref="checkbox"
type={ props.inputType}
style={ hide}
type={props.inputType}
style={hide}
name={name}
value={value}
defaultChecked={ props.defaultChecked}
onChange={ this.handleChange.bind(this)}
onBlur={ this.handleBlur.bind(this)}
onFocus={ this.handleFocus.bind(this)}
defaultChecked={props.defaultChecked}
onChange={this.handleChange.bind(this)}
onBlur={this.handleBlur.bind(this)}
onFocus={this.handleFocus.bind(this)}
/>
);

Expand All @@ -462,7 +456,7 @@ class EnhancedSwitch extends React.Component {
return inputContainer;
}
if (!React.isValidElement(labelElement)) {
labelElement = <span dangerouslySetInnerHTML={{ __html: labelElement }}/>;
labelElement = <span dangerouslySetInnerHTML={{ __html: labelElement }} />;
}

// Label events
Expand Down

0 comments on commit 55f694b

Please sign in to comment.