Skip to content

Commit 9827525

Browse files
LKayLKay
committed
Add updated compiled files
1 parent 61634ba commit 9827525

File tree

8 files changed

+168
-38
lines changed

8 files changed

+168
-38
lines changed

‎dist/react.bootstrap.datetimepicker.js

Lines changed: 80 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,28 @@ return /******/ (function(modules) { // webpackBootstrap
183183
var _this$props = _this.props;
184184
var defaultDate = _this$props.defaultDate;
185185
var icons = _this$props.icons;
186+
var mode = _this$props.mode;
186187
var tooltips = _this$props.tooltips;
187188
var useCurrent = _this$props.useCurrent;
188189
var viewMode = _this$props.viewMode;
189190

190191
_this.icons = Object.assign({}, defaultIcons, icons);
191192
_this.tooltips = Object.assign({}, tooltips, defaultTooltips);
192193

194+
var dateTime = (0, _moment2.default)();
195+
196+
if (defaultDate) {
197+
if (mode === _config.MODE_DATE) {
198+
dateTime = (0, _moment2.default)(defaultDate).startOf("day");
199+
} else {
200+
dateTime = (0, _moment2.default)(defaultDate);
201+
}
202+
} else if (mode === _config.MODE_DATE) {
203+
dateTime = (0, _moment2.default)().startOf("day");
204+
}
205+
193206
_this.state = Object.assign({}, _this.state, {
194-
dateTime: defaultDate ? (0, _moment2.default)(defaultDate) : (0, _moment2.default)(),
207+
dateTime: dateTime,
195208
selected: defaultDate || useCurrent,
196209
viewMode: _this.state.viewMode || viewMode
197210
});
@@ -203,11 +216,8 @@ return /******/ (function(modules) { // webpackBootstrap
203216
/*
204217
extraFormats : React.PropTypes.any,
205218
calendarWeeks : React.PropTypes.any,
206-
keepOpen : React.PropTypes.any,
207219
keepInvalid : React.PropTypes.any,
208-
debug : React.PropTypes.any,
209220
disabledTimeIntervals : React.PropTypes.any,
210-
focusOnShow : React.PropTypes.any,
211221
enabledHours : React.PropTypes.any,
212222
disabledHours : React.PropTypes.any
213223
*/
@@ -276,9 +286,12 @@ return /******/ (function(modules) { // webpackBootstrap
276286
var inline = _props.inline;
277287
var inputFormat = _props.inputFormat;
278288
var mode = _props.mode;
289+
var placeholder = _props.placeholder;
279290
var size = _props.size;
280291
var widgetParent = _props.widgetParent;
281-
var selected = this.state.selected;
292+
var _state3 = this.state;
293+
var dateTime = _state3.dateTime;
294+
var selected = _state3.selected;
282295

283296
var displayFormat = inputFormat;
284297

@@ -297,7 +310,7 @@ return /******/ (function(modules) { // webpackBootstrap
297310
}
298311
}
299312

300-
var inputValue = selected ? (0, _moment2.default)(this.state.dateTime).format(displayFormat) : null;
313+
var inputValue = selected ? (0, _moment2.default)(this.state.dateTime).format(displayFormat) : placeholder;
301314

302315
var picker = undefined;
303316

@@ -315,6 +328,8 @@ return /******/ (function(modules) { // webpackBootstrap
315328
icons: this.icons,
316329
bsSize: bsSize || size,
317330
value: inputValue,
331+
selected: selected,
332+
dateTime: dateTime,
318333
container: widgetParent,
319334
onChange: this.onChangeInput,
320335
onClickToday: this.onClickToday,
@@ -340,20 +355,24 @@ return /******/ (function(modules) { // webpackBootstrap
340355
dateTime: (0, _reactPropTypes.deprecated)(_react2.default.PropTypes.string, "Use \"value\" instead"),
341356
dayViewHeaderFormat: _react2.default.PropTypes.string,
342357
daysOfWeekDisabled: _react2.default.PropTypes.arrayOf(_react2.default.PropTypes.number),
358+
debug: _react2.default.PropTypes.bool,
343359
defaultDate: _react2.default.PropTypes.oneOfType([_react2.default.PropTypes.number, _react2.default.PropTypes.string, _react2.default.PropTypes.instanceOf(Date), _reactMomentProptypes2.default.momentObj]),
344360
disabledDates: _react2.default.PropTypes.oneOfType([_react2.default.PropTypes.bool, _react2.default.PropTypes.arrayOf(_react2.default.PropTypes.oneOfType([_react2.default.PropTypes.number, _react2.default.PropTypes.string, _react2.default.PropTypes.instanceOf(Date), _reactMomentProptypes2.default.momentObj]))]),
345361
enabledDates: _react2.default.PropTypes.oneOfType([_react2.default.PropTypes.bool, _react2.default.PropTypes.arrayOf(_react2.default.PropTypes.oneOfType([_react2.default.PropTypes.number, _react2.default.PropTypes.string, _react2.default.PropTypes.instanceOf(Date), _reactMomentProptypes2.default.momentObj]))]),
362+
focusOnShow: _react2.default.PropTypes.bool,
346363
format: _react2.default.PropTypes.string,
347364
icon: _react2.default.PropTypes.bool,
348365
icons: _react2.default.PropTypes.objectOf(_react2.default.PropTypes.string),
349366
inline: _react2.default.PropTypes.bool,
350367
inputFormat: _react2.default.PropTypes.string,
351368
inputProps: _react2.default.PropTypes.object,
369+
keepOpen: _react2.default.PropTypes.bool,
352370
locale: _react2.default.PropTypes.string,
353371
maxDate: _react2.default.PropTypes.oneOfType([_react2.default.PropTypes.number, _react2.default.PropTypes.string, _react2.default.PropTypes.instanceOf(Date), _reactMomentProptypes2.default.momentObj]),
354372
minDate: _react2.default.PropTypes.oneOfType([_react2.default.PropTypes.number, _react2.default.PropTypes.string, _react2.default.PropTypes.instanceOf(Date), _reactMomentProptypes2.default.momentObj]),
355373
mode: _react2.default.PropTypes.oneOf([_config.MODE_DATE, _config.MODE_TIME, _config.MODE_DATETIME]),
356374
onChange: _react2.default.PropTypes.func,
375+
placeholder: _react2.default.PropTypes.string,
357376
showClear: _react2.default.PropTypes.bool,
358377
showClose: _react2.default.PropTypes.bool,
359378
showToday: _react2.default.PropTypes.bool,
@@ -374,6 +393,7 @@ return /******/ (function(modules) { // webpackBootstrap
374393
dayViewHeaderFormat: _config.DEFAULT_DAY_VIEW_HEADER,
375394
disabledDates: false,
376395
enabledDates: false,
396+
focusOnShow: true,
377397
format: _config.DEFAULT_FORMAT,
378398
icon: true,
379399
icons: {},
@@ -393,7 +413,6 @@ return /******/ (function(modules) { // webpackBootstrap
393413
var _this2 = this;
394414

395415
this.state = {
396-
show: false,
397416
view: _config.VIEW_DATE
398417
};
399418
this.icons = {};
@@ -36249,6 +36268,10 @@ return /******/ (function(modules) { // webpackBootstrap
3624936268

3625036269
var _reactPropTypes = __webpack_require__(278);
3625136270

36271+
var _reactMomentProptypes = __webpack_require__(178);
36272+
36273+
var _reactMomentProptypes2 = _interopRequireDefault(_reactMomentProptypes);
36274+
3625236275
var _fade = __webpack_require__(356);
3625336276

3625436277
var _fade2 = _interopRequireDefault(_fade);
@@ -36269,6 +36292,12 @@ return /******/ (function(modules) { // webpackBootstrap
3626936292

3627036293
var _vertical2 = _interopRequireDefault(_vertical);
3627136294

36295+
var _config = __webpack_require__(296);
36296+
36297+
var _moment = __webpack_require__(179);
36298+
36299+
var _moment2 = _interopRequireDefault(_moment);
36300+
3627236301
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
3627336302

3627436303
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -36307,12 +36336,28 @@ return /******/ (function(modules) { // webpackBootstrap
3630736336
}
3630836337

3630936338
_createClass(DateTimePickerLayoutInput, [{
36339+
key: "componentWillReceiveProps",
36340+
value: function componentWillReceiveProps(props) {
36341+
var show = this.state.show;
36342+
var mode = props.mode;
36343+
var keepOpen = props.keepOpen;
36344+
var dateTime = props.dateTime;
36345+
var selected = props.selected;
36346+
36347+
var dayChanged = (0, _moment2.default)(this.props.dateTime).date() !== (0, _moment2.default)(dateTime).date();
36348+
36349+
if (show && selected && dayChanged && !keepOpen && mode === _config.MODE_DATE) {
36350+
this.setState({ show: false });
36351+
}
36352+
}
36353+
}, {
3631036354
key: "render",
3631136355
value: function render() {
3631236356
var _this2 = this;
3631336357

3631436358
var _props = this.props;
3631536359
var container = _props.container;
36360+
var debug = _props.debug;
3631636361
var sideBySide = _props.sideBySide;
3631736362
var show = this.state.show;
3631836363

@@ -36333,13 +36378,14 @@ return /******/ (function(modules) { // webpackBootstrap
3633336378
"div",
3633436379
{ style: { position: "relative" } },
3633536380
_react2.default.createElement(_input2.default, _extends({}, this.props, {
36381+
show: show,
3633636382
ref: "input",
3633736383
onClick: this.onClickInput })),
3633836384
_react2.default.createElement(
3633936385
_reactOverlays.Overlay,
3634036386
{ placement: "bottom",
3634136387
show: show,
36342-
rootClose: true,
36388+
rootClose: !debug,
3634336389
transition: _fade2.default,
3634436390
onHide: this.onHidePopup,
3634536391
container: container,
@@ -36363,6 +36409,8 @@ return /******/ (function(modules) { // webpackBootstrap
3636336409
bsSize: _react2.default.PropTypes.string,
3636436410
container: _reactPropTypes.mountable,
3636536411
datePicker: _react2.default.PropTypes.node,
36412+
dateTime: _reactMomentProptypes2.default.momentObj,
36413+
debug: _react2.default.PropTypes.bool,
3636636414
icon: _react2.default.PropTypes.bool,
3636736415
icons: _react2.default.PropTypes.object,
3636836416
sideBySide: _react2.default.PropTypes.bool,
@@ -39971,6 +40019,8 @@ return /******/ (function(modules) { // webpackBootstrap
3997140019

3997240020
var _react2 = _interopRequireDefault(_react);
3997340021

40022+
var _reactDom = __webpack_require__(303);
40023+
3997440024
var _classnames = __webpack_require__(289);
3997540025

3997640026
var _classnames2 = _interopRequireDefault(_classnames);
@@ -40019,15 +40069,28 @@ return /******/ (function(modules) { // webpackBootstrap
4001940069
}
4002040070

4002140071
_createClass(DateTimePickerInput, [{
40072+
key: "componentDidUpdate",
40073+
value: function componentDidUpdate() {
40074+
var _props = this.props;
40075+
var focusOnShow = _props.focusOnShow;
40076+
var show = _props.show;
40077+
40078+
var input = (0, _reactDom.findDOMNode)(this.refs.input);
40079+
40080+
if (show && focusOnShow && input) {
40081+
input.focus();
40082+
}
40083+
}
40084+
}, {
4002240085
key: "render",
4002340086
value: function render() {
40024-
var _props = this.props;
40025-
var bsSize = _props.bsSize;
40026-
var icons = _props.icons;
40027-
var inputProps = _props.inputProps;
40028-
var mode = _props.mode;
40029-
var onClick = _props.onClick;
40030-
var value = _props.value;
40087+
var _props2 = this.props;
40088+
var bsSize = _props2.bsSize;
40089+
var icons = _props2.icons;
40090+
var inputProps = _props2.inputProps;
40091+
var mode = _props2.mode;
40092+
var onClick = _props2.onClick;
40093+
var value = _props2.value;
4003140094

4003240095
var classes = (0, _classnames2.default)("input-group", "date", _defineProperty({}, "input-group-" + bsSize, bsSize));
4003340096

@@ -40057,12 +40120,14 @@ return /******/ (function(modules) { // webpackBootstrap
4005740120

4005840121
DateTimePickerInput.propTypes = {
4005940122
bsSize: _react2.default.PropTypes.string,
40123+
focusOnShow: _react2.default.PropTypes.bool,
4006040124
icon: _react2.default.PropTypes.bool,
4006140125
icons: _react2.default.PropTypes.object,
4006240126
inputProps: _react2.default.PropTypes.object,
4006340127
mode: _react2.default.PropTypes.string,
4006440128
onChange: _react2.default.PropTypes.func,
4006540129
onClick: _react2.default.PropTypes.func,
40130+
show: _react2.default.PropTypes.bool,
4006640131
value: _react2.default.PropTypes.string
4006740132
};
4006840133
exports.default = DateTimePickerInput;

‎dist/react.bootstrap.datetimepicker.min.js

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

‎lib/components/input.js

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

0 commit comments

Comments
 (0)