Merge branch 'master' into button-enhancements

* master:
  Patch: Placeholder in <DatePicker>
  Bumped such as NPM Commands
  Revert "Added bumped to a npm command"
  Added bumped to a npm command
  removing UV_THREADPOOL_SIZE set, now executed from npm start script.
  adding cross-env command to npm start scripts for windows compatibility.
old
Javi Velasco 2015-11-17 18:41:55 +01:00
commit 28e97c15ad
6 changed files with 13 additions and 9 deletions

View File

@ -10,9 +10,14 @@ class DatePicker extends React.Component {
maxDate: React.PropTypes.object,
minDate: React.PropTypes.object,
onChange: React.PropTypes.func,
placeholder: React.PropTypes.string,
value: React.PropTypes.object
};
static defaultProps = {
placeholder: 'Choose a date'
};
state = {
active: false
};
@ -40,7 +45,7 @@ class DatePicker extends React.Component {
<Input
className={style.input}
onMouseDown={this.handleInputMouseDown}
placeholder='Pick up date'
placeholder={this.props.placeholder}
readOnly={true}
type='text'
value={date}

View File

@ -40,4 +40,5 @@ class DatePickerTest extends React.Component {
| `maxDate` | `Date` | | Date object with the maximum selectable date. |
| `minDate` | `Date` | | Date object with the minimum selectable date. |
| `onChange` | `Function` | | Callback called when the picker value is changed.|
| `placeholder` | `String` | | The text string to use like a input placeholder.|
| `value` | `Date` | | Date object with the currently selected date. |

View File

@ -4,7 +4,7 @@
"description": "Documentation for React Toolbox",
"author": "React Toolbox Team (http://github.com/react-toolbox)",
"scripts": {
"start": "node ./server",
"start": "cross-env NODE_ENV=development UV_THREADPOOL_SIZE=100 node ./server",
"build": "cross-env NODE_ENV=production UV_THREADPOOL_SIZE=100 webpack --config ./webpack.config.production --colors --profile --progress",
"deploy": "gh-pages -d build"
},

View File

@ -1,5 +1,3 @@
process.env.UV_THREADPOOL_SIZE = 100;
const path = require('path');
const express = require('express');
const webpack = require('webpack');

View File

@ -1,6 +1,6 @@
{
"name": "react-toolbox",
"version": "0.12.5",
"version": "0.12.6",
"homepage": "www.react-toolbox.com",
"description": "A set of React components implementing Google's Material Design specification with the power of CSS Modules.",
"author": "React Toolbox Team (http://github.com/react-toolbox)",
@ -18,7 +18,7 @@
],
"main": "./lib",
"scripts": {
"start": "node ./server",
"start": "cross-env NODE_ENV=development UV_THREADPOOL_SIZE=100 node ./server",
"lint": "eslint ./ --ext .js,.jsx",
"babel": "babel ./components --out-dir ./lib",
"sass": "cpx './components/**/*.scss' ./lib",
@ -27,7 +27,9 @@
"prebuild": "npm run clean",
"prepublish": "npm run build",
"test": "cross-env NODE_ENV=test karma start",
"test:watch": "cross-env NODE_ENV=test karma start --no-single-run"
"test:watch": "cross-env NODE_ENV=test karma start --no-single-run",
"release": "bumped release",
"patch": "bumped release patch"
},
"bugs": {
"url": "https://github.com/react-toolbox/react-toolbox/issues",

View File

@ -1,5 +1,3 @@
process.env.UV_THREADPOOL_SIZE = 100;
const path = require('path');
const express = require('express');
const webpack = require('webpack');