Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# React-Select

## v0.9.1-wday-react15

* fixed; peer dependency when using react 15

## v0.9.1 / 2015-11-01

* added; new Contributors example w/ async options loading and custom value / label keys
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dist/react-select.min.js",
"dist/default.css"
],
"version": "0.9.1",
"version": "0.9.1-wday-react15",
"homepage": "https://github.com/JedWatson/react-select",
"authors": [
"Jed Watson"
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-select",
"version": "0.9.1",
"version": "0.9.1-wday-react15",
"description": "A Select control built with and for ReactJS",
"main": "lib/Select.js",
"style": "dist/default.css",
Expand Down Expand Up @@ -36,8 +36,8 @@
"unexpected-sinon": "^8.0.0"
},
"peerDependencies": {
"react": "^0.14.1",
"react-dom": "^0.14.1"
"react": "^15.3.1",
"react-dom": "^15.3.1"
},
"browserify-shim": {
"classnames": "global:classNames",
Expand Down
4 changes: 2 additions & 2 deletions src/Select.js
Original file line number Diff line number Diff line change
Expand Up @@ -602,9 +602,9 @@ var Select = React.createClass({

if (asyncOpts && typeof asyncOpts.then === 'function') {
asyncOpts.then((data) => {
optionsResponseHandler(null, data)
optionsResponseHandler(null, data);
}, (err) => {
optionsResponseHandler(err)
optionsResponseHandler(err);
});
}
},
Expand Down
4 changes: 2 additions & 2 deletions test/Select-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1391,8 +1391,8 @@ describe('Select', () => {
});

return new Promise((resolve, reject) => {
input === '_FAIL'? reject('nope') : resolve({options: options});
})
input === '_FAIL'? reject('nope') : resolve({ options: options });
});
});
});

Expand Down