Skip to content

Commit 06cf693

Browse files
author
theporchrat
committed
prepare for release
1 parent 0ef15bf commit 06cf693

File tree

7 files changed

+31
-20
lines changed

7 files changed

+31
-20
lines changed

browser/react-widgets.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/react-widgets.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/docs.js

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/pickers/datepicker.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ var propTypes = {
2727
timeComponent: React.PropTypes.func,
2828
duration: React.PropTypes.number, //popup
2929

30+
initialView: React.PropTypes.oneOf(['month', 'year', 'decade', 'century']),
31+
finalView: React.PropTypes.oneOf(['month', 'year', 'decade', 'century']),
32+
3033
parse: React.PropTypes.oneOfType([
3134
React.PropTypes.arrayOf(React.PropTypes.string),
3235
React.PropTypes.string,

lib/util/transferProps.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ module.exports = {
3030
},
3131

3232
cloneWithProps: function (child, props) {
33-
var newProps = mergeProps(_.clone(props), child.props);
33+
var newProps = mergeProps(_.clone(props), child.props)
34+
, version = _.map(React.version.split('.'), parseFloat);
3435

3536
if (!_.has(newProps, 'children') && _.has(child.props, 'children'))
3637
newProps.children = child.props.children;
3738

38-
if (React.version.indexOf('0.10.') === 0) //thanks react-bootstrap!
39+
// TODO remove eventually
40+
if (version[0] === 0 && version[1] < 11)
3941
return child.constructor.ConvenienceConstructor(newProps);
4042

4143
return child.constructor(newProps);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-widgets",
3-
"version": "1.1.2",
3+
"version": "1.2.0",
44
"description": "React widgets",
55
"main": "index.js",
66
"author": {

src/util/transferProps.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ module.exports = {
3030
},
3131

3232
cloneWithProps: function (child, props) {
33-
var newProps = mergeProps(_.clone(props), child.props);
33+
var newProps = mergeProps(_.clone(props), child.props)
34+
, version = _.map(React.version.split('.'), parseFloat);
3435

3536
if (!_.has(newProps, 'children') && _.has(child.props, 'children'))
3637
newProps.children = child.props.children;
3738

38-
if (React.version.indexOf('0.10.') === 0) //thanks react-bootstrap!
39+
// TODO remove eventually
40+
if (version[0] === 0 && version[1] < 11)
3941
return child.constructor.ConvenienceConstructor(newProps);
4042

4143
return child.constructor(newProps);

0 commit comments

Comments
 (0)