Skip to content

Commit 6bd25e9

Browse files
author
Trevor Burnham
committed
Fix duplicate code from bad merge conflict resolution
1 parent f8a8d27 commit 6bd25e9

File tree

6 files changed

+6
-41
lines changed

6 files changed

+6
-41
lines changed

dist/react-select-plus.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -2050,12 +2050,6 @@ var Select = _react2['default'].createClass({
20502050
}
20512051
},
20522052

2053-
onOptionRef: function onOptionRef(ref, isFocused) {
2054-
if (isFocused) {
2055-
this.focused = ref;
2056-
}
2057-
},
2058-
20592053
renderMenu: function renderMenu(options, valueArray, focusedOption) {
20602054
if (options && options.length) {
20612055
return this.props.menuRenderer({
@@ -2073,8 +2067,7 @@ var Select = _react2['default'].createClass({
20732067
options: options,
20742068
selectValue: this.selectValue,
20752069
valueArray: valueArray,
2076-
valueKey: this.props.valueKey,
2077-
onOptionRef: this.onOptionRef
2070+
valueKey: this.props.valueKey
20782071
});
20792072
} else if (this.props.noResultsText) {
20802073
return _react2['default'].createElement(

dist/react-select-plus.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/dist/bundle.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -2350,12 +2350,6 @@ var Select = _react2['default'].createClass({
23502350
}
23512351
},
23522352

2353-
onOptionRef: function onOptionRef(ref, isFocused) {
2354-
if (isFocused) {
2355-
this.focused = ref;
2356-
}
2357-
},
2358-
23592353
renderMenu: function renderMenu(options, valueArray, focusedOption) {
23602354
if (options && options.length) {
23612355
return this.props.menuRenderer({
@@ -2373,8 +2367,7 @@ var Select = _react2['default'].createClass({
23732367
options: options,
23742368
selectValue: this.selectValue,
23752369
valueArray: valueArray,
2376-
valueKey: this.props.valueKey,
2377-
onOptionRef: this.onOptionRef
2370+
valueKey: this.props.valueKey
23782371
});
23792372
} else if (this.props.noResultsText) {
23802373
return _react2['default'].createElement(

examples/dist/standalone.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -2050,12 +2050,6 @@ var Select = _react2['default'].createClass({
20502050
}
20512051
},
20522052

2053-
onOptionRef: function onOptionRef(ref, isFocused) {
2054-
if (isFocused) {
2055-
this.focused = ref;
2056-
}
2057-
},
2058-
20592053
renderMenu: function renderMenu(options, valueArray, focusedOption) {
20602054
if (options && options.length) {
20612055
return this.props.menuRenderer({
@@ -2073,8 +2067,7 @@ var Select = _react2['default'].createClass({
20732067
options: options,
20742068
selectValue: this.selectValue,
20752069
valueArray: valueArray,
2076-
valueKey: this.props.valueKey,
2077-
onOptionRef: this.onOptionRef
2070+
valueKey: this.props.valueKey
20782071
});
20792072
} else if (this.props.noResultsText) {
20802073
return _react2['default'].createElement(

lib/Select.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -1164,12 +1164,6 @@ var Select = _react2['default'].createClass({
11641164
}
11651165
},
11661166

1167-
onOptionRef: function onOptionRef(ref, isFocused) {
1168-
if (isFocused) {
1169-
this.focused = ref;
1170-
}
1171-
},
1172-
11731167
renderMenu: function renderMenu(options, valueArray, focusedOption) {
11741168
if (options && options.length) {
11751169
return this.props.menuRenderer({
@@ -1187,8 +1181,7 @@ var Select = _react2['default'].createClass({
11871181
options: options,
11881182
selectValue: this.selectValue,
11891183
valueArray: valueArray,
1190-
valueKey: this.props.valueKey,
1191-
onOptionRef: this.onOptionRef
1184+
valueKey: this.props.valueKey
11921185
});
11931186
} else if (this.props.noResultsText) {
11941187
return _react2['default'].createElement(

src/Select.js

-7
Original file line numberDiff line numberDiff line change
@@ -1073,12 +1073,6 @@ const Select = React.createClass({
10731073
}
10741074
},
10751075

1076-
onOptionRef(ref, isFocused) {
1077-
if (isFocused) {
1078-
this.focused = ref;
1079-
}
1080-
},
1081-
10821076
renderMenu (options, valueArray, focusedOption) {
10831077
if (options && options.length) {
10841078
return this.props.menuRenderer({
@@ -1097,7 +1091,6 @@ const Select = React.createClass({
10971091
selectValue: this.selectValue,
10981092
valueArray,
10991093
valueKey: this.props.valueKey,
1100-
onOptionRef: this.onOptionRef,
11011094
});
11021095
} else if (this.props.noResultsText) {
11031096
return (

0 commit comments

Comments
 (0)