marquex
2015-07-10 3515a4f486275869be80d6d000c31b9ea0a3b80c
Renames dateFormat and timeFormat to enableDate and enableTime
1 files modified
46 ■■■■■ changed files
DateTime.js 46 ●●●●● patch | view | raw | blame | history
DateTime.js
@@ -26,8 +26,8 @@
        onChange: TYPES.func,
        locale: TYPES.string,
        input: TYPES.bool,
        dateFormat: TYPES.string,
        timeFormat: TYPES.string,
        // enableDate: TYPES.string,
        // enableTime: TYPES.string,
        inputProps: TYPES.object,
        viewMode: TYPES.oneOf(['years', 'months', 'days', 'time']),
        minDate: TYPES.object,
@@ -40,6 +40,8 @@
            viewMode: 'days',
            inputProps: {},
            input: true,
            enableTime: true,
            enableDate: true,
            onBlur: function () {},
            onChange: function (x) {
                console.log(x);
@@ -48,10 +50,15 @@
    },
    getInitialState: function() {
        var formats = this.getFormats( this.props ),
            date = this.props.date
            date = this.props.date,
            currentView = this.props.viewMode
        ;
        if( !formats.date )
            currentView = 'time';
        return {
            currentView: this.props.viewMode,
            currentView: currentView,
            open: !this.props.input,
            inputFormat: formats.datetime,
            viewDate: this.localMoment(date).startOf("month"),
@@ -62,37 +69,20 @@
    getFormats: function( props ){
        var formats = {
                date: '',
                time: '',
                datetime: ''
                date: props.enableDate || '',
                time: props.enableTime || ''
            },
            locale = this.localMoment( props.date ).localeData()
        ;
        if( props.dateFormat ){
            formats.date = props.dateFormat;
        if( formats.date === true ){
            formats.date = locale.longDateFormat('L');
        }
        if( props.timeFormat ){
            formats.time = props.timeFormat;
        if( formats.time === true ){
            formats.time = locale.longDateFormat('LT');
        }
        if( !formats.date && !formats.time ){
            formats.date = locale.longDateFormat('L');
            formats.time = locale.longDateFormat('LT');
            formats.datetime = formats.date + ' ' + formats.time;
        }
        else {
            if( props.dateFormat ){
                formats.date = props.dateFormat;
                formats.datetime = formats.date;
            }
            if( props.timeFormat ){
                if( formats.date )
                    formats.datetime += ' ';
                formats.time = props.timeFormat;
                formats.datetime += formats.time;
            }
        }
        formats.datetime = formats.date + ' ' + formats.time;
        return formats;
    },