Merge branch 'master' of https://github.com/arqex/react-datetime

marquex

2015-07-14 907c50f27c255dc5db209bbb88fc63ca6a4db2fe

Merge branch 'master' of https://github.com/arqex/react-datetime

 DateTime.js

@@ -1,5 +1,7 @@
'use strict';

require('classlist-polyfill');

var assign = require('object-assign'),
    React = require('react'),
    DaysView = require('./src/DaysView'),
@@ -36,6 +38,7 @@
    getDefaultProps: function() {
        var nof = function(){};
        return {
            className: 'form-control',
            date: new Date(),
            viewMode: 'days',
            inputProps: {},
@@ -139,7 +142,7 @@
        ;
        return function( e ){
            me.setState({
                viewDate: me.state.viewDate.clone()[ type ]( parseInt(e.target.dataset.value) ).startOf( type ),
                viewDate: me.state.viewDate.clone()[ type ]( parseInt(e.target.getAttribute('data-value')) ).startOf( type ),
                currentView: nextViews[ type ]
            });
        };
@@ -204,7 +207,7 @@

        date = this.state.viewDate.clone()
            .month( this.state.viewDate.month() + modifier )
            .date( parseInt( target.dataset.value ) )
            .date( parseInt( target.getAttribute('data-value') ) )
            .hours( currentDate.hours() )
            .minutes( currentDate.minutes() )
            .seconds( currentDate.seconds() )
@@ -273,7 +276,7 @@
            children = [ DOM.input( assign({
                key: 'i',
                type:'text',
                className:'form-control',
                className: 'form-control', 
                onFocus: this.openCalendar,
                onChange: this.onChange,
                value: this.state.inputValue

 package.json

@@ -37,6 +37,7 @@
    "webpack-dev-server": "^1.7.0"
  },
  "dependencies": {
    "classlist-polyfill": "^1.0.1",
    "object-assign": "^3.0.0",
    "react-onclickoutside": "^0.2.4"
  }