prepare for release

jquense · Oct 2, 2014 · 06cf693 · 06cf693
1 parent 0ef15bf
commit 06cf693
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 20 deletions.
diff --git a/browser/react-widgets.js b/browser/react-widgets.js
diff --git a/dist/react-widgets.js b/dist/react-widgets.js
diff --git a/docs/docs.js b/docs/docs.js
diff --git a/lib/pickers/datepicker.js b/lib/pickers/datepicker.js
@@ -27,6 +27,9 @@ var propTypes = {
     timeComponent:  React.PropTypes.func,
     duration:       React.PropTypes.number, //popup
 
+    initialView:    React.PropTypes.oneOf(['month', 'year', 'decade', 'century']),
+    finalView:      React.PropTypes.oneOf(['month', 'year', 'decade', 'century']),
+
     parse:          React.PropTypes.oneOfType([
                       React.PropTypes.arrayOf(React.PropTypes.string),
                       React.PropTypes.string,

diff --git a/lib/util/transferProps.js b/lib/util/transferProps.js
@@ -30,12 +30,14 @@ module.exports = {
   },
 
   cloneWithProps: function (child, props) {
-    var newProps = mergeProps(_.clone(props), child.props);
+    var newProps = mergeProps(_.clone(props), child.props)
+      , version  = _.map(React.version.split('.'), parseFloat);
 
     if (!_.has(newProps, 'children') && _.has(child.props, 'children'))
       newProps.children = child.props.children;
 
-    if (React.version.indexOf('0.10.') === 0) //thanks react-bootstrap!
+    // TODO remove eventually
+    if (version[0] === 0 && version[1] < 11) 
       return child.constructor.ConvenienceConstructor(newProps);
 
     return child.constructor(newProps);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-widgets",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "React widgets",
   "main": "index.js",
   "author": {

diff --git a/src/util/transferProps.js b/src/util/transferProps.js
@@ -30,12 +30,14 @@ module.exports = {
   },
 
   cloneWithProps: function (child, props) {
-    var newProps = mergeProps(_.clone(props), child.props);
+    var newProps = mergeProps(_.clone(props), child.props)
+      , version  = _.map(React.version.split('.'), parseFloat);
 
     if (!_.has(newProps, 'children') && _.has(child.props, 'children'))
       newProps.children = child.props.children;
 
-    if (React.version.indexOf('0.10.') === 0) //thanks react-bootstrap!
+    // TODO remove eventually
+    if (version[0] === 0 && version[1] < 11) 
       return child.constructor.ConvenienceConstructor(newProps);
 
     return child.constructor(newProps);