Skip to content

Commit 99929e8

Browse files
bluebirrrrdbluebirrrrd
committed
🐛 fix colspan property to work with XML layout
1 parent 87a4ca3 commit 99929e8

File tree

10 files changed

+1502
-305
lines changed

10 files changed

+1502
-305
lines changed

‎dist/react-datetime.js

Lines changed: 129 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MIT: https://github.com/YouCanBookMe/react-datetime/raw/master/LICENSE
1212
exports["Datetime"] = factory(require("React"), require("moment"), require("ReactDOM"));
1313
else
1414
root["Datetime"] = factory(root["React"], root["moment"], root["ReactDOM"]);
15-
})(this, function(__WEBPACK_EXTERNAL_MODULE_12__, __WEBPACK_EXTERNAL_MODULE_15__, __WEBPACK_EXTERNAL_MODULE_19__) {
15+
})(this, function(__WEBPACK_EXTERNAL_MODULE_12__, __WEBPACK_EXTERNAL_MODULE_16__, __WEBPACK_EXTERNAL_MODULE_20__) {
1616
return /******/ (function(modules) { // webpackBootstrap
1717
/******/ // The module cache
1818
/******/ var installedModules = {};
@@ -64,9 +64,9 @@ return /******/ (function(modules) { // webpackBootstrap
6464
var assign = __webpack_require__(1),
6565
PropTypes = __webpack_require__(2),
6666
createClass = __webpack_require__(11),
67-
moment = __webpack_require__(15),
67+
moment = __webpack_require__(16),
6868
React = __webpack_require__(12),
69-
CalendarContainer = __webpack_require__(16)
69+
CalendarContainer = __webpack_require__(17)
7070
;
7171

7272
var viewModes = Object.freeze({
@@ -1720,9 +1720,9 @@ return /******/ (function(modules) { // webpackBootstrap
17201720

17211721
'use strict';
17221722

1723-
var _assign = __webpack_require__(1);
1723+
var _assign = __webpack_require__(14);
17241724

1725-
var emptyObject = __webpack_require__(14);
1725+
var emptyObject = __webpack_require__(15);
17261726
var _invariant = __webpack_require__(6);
17271727

17281728
if (process.env.NODE_ENV !== 'production') {
@@ -2585,6 +2585,102 @@ return /******/ (function(modules) { // webpackBootstrap
25852585

25862586
/***/ }),
25872587
/* 14 */
2588+
/***/ (function(module, exports) {
2589+
2590+
/*
2591+
object-assign
2592+
(c) Sindre Sorhus
2593+
@license MIT
2594+
*/
2595+
2596+
'use strict';
2597+
/* eslint-disable no-unused-vars */
2598+
var getOwnPropertySymbols = Object.getOwnPropertySymbols;
2599+
var hasOwnProperty = Object.prototype.hasOwnProperty;
2600+
var propIsEnumerable = Object.prototype.propertyIsEnumerable;
2601+
2602+
function toObject(val) {
2603+
if (val === null || val === undefined) {
2604+
throw new TypeError('Object.assign cannot be called with null or undefined');
2605+
}
2606+
2607+
return Object(val);
2608+
}
2609+
2610+
function shouldUseNative() {
2611+
try {
2612+
if (!Object.assign) {
2613+
return false;
2614+
}
2615+
2616+
// Detect buggy property enumeration order in older V8 versions.
2617+
2618+
// https://bugs.chromium.org/p/v8/issues/detail?id=4118
2619+
var test1 = new String('abc'); // eslint-disable-line no-new-wrappers
2620+
test1[5] = 'de';
2621+
if (Object.getOwnPropertyNames(test1)[0] === '5') {
2622+
return false;
2623+
}
2624+
2625+
// https://bugs.chromium.org/p/v8/issues/detail?id=3056
2626+
var test2 = {};
2627+
for (var i = 0; i < 10; i++) {
2628+
test2['_' + String.fromCharCode(i)] = i;
2629+
}
2630+
var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
2631+
return test2[n];
2632+
});
2633+
if (order2.join('') !== '0123456789') {
2634+
return false;
2635+
}
2636+
2637+
// https://bugs.chromium.org/p/v8/issues/detail?id=3056
2638+
var test3 = {};
2639+
'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
2640+
test3[letter] = letter;
2641+
});
2642+
if (Object.keys(Object.assign({}, test3)).join('') !==
2643+
'abcdefghijklmnopqrst') {
2644+
return false;
2645+
}
2646+
2647+
return true;
2648+
} catch (err) {
2649+
// We don't expect any of the above to throw, but better to be safe.
2650+
return false;
2651+
}
2652+
}
2653+
2654+
module.exports = shouldUseNative() ? Object.assign : function (target, source) {
2655+
var from;
2656+
var to = toObject(target);
2657+
var symbols;
2658+
2659+
for (var s = 1; s < arguments.length; s++) {
2660+
from = Object(arguments[s]);
2661+
2662+
for (var key in from) {
2663+
if (hasOwnProperty.call(from, key)) {
2664+
to[key] = from[key];
2665+
}
2666+
}
2667+
2668+
if (getOwnPropertySymbols) {
2669+
symbols = getOwnPropertySymbols(from);
2670+
for (var i = 0; i < symbols.length; i++) {
2671+
if (propIsEnumerable.call(from, symbols[i])) {
2672+
to[symbols[i]] = from[symbols[i]];
2673+
}
2674+
}
2675+
}
2676+
}
2677+
2678+
return to;
2679+
};
2680+
2681+
2682+
/***/ }),
2683+
/* 15 */
25882684
/***/ (function(module, exports, __webpack_require__) {
25892685

25902686
/* WEBPACK VAR INJECTION */(function(process) {/**
@@ -2609,23 +2705,23 @@ return /******/ (function(modules) { // webpackBootstrap
26092705
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(3)))
26102706

26112707
/***/ }),
2612-
/* 15 */
2708+
/* 16 */
26132709
/***/ (function(module, exports) {
26142710

2615-
module.exports = __WEBPACK_EXTERNAL_MODULE_15__;
2711+
module.exports = __WEBPACK_EXTERNAL_MODULE_16__;
26162712

26172713
/***/ }),
2618-
/* 16 */
2714+
/* 17 */
26192715
/***/ (function(module, exports, __webpack_require__) {
26202716

26212717
'use strict';
26222718

26232719
var React = __webpack_require__(12),
26242720
createClass = __webpack_require__(11),
2625-
DaysView = __webpack_require__(17),
2626-
MonthsView = __webpack_require__(21),
2627-
YearsView = __webpack_require__(22),
2628-
TimeView = __webpack_require__(23)
2721+
DaysView = __webpack_require__(18),
2722+
MonthsView = __webpack_require__(22),
2723+
YearsView = __webpack_require__(23),
2724+
TimeView = __webpack_require__(24)
26292725
;
26302726

26312727
var CalendarContainer = createClass({
@@ -2645,15 +2741,15 @@ return /******/ (function(modules) { // webpackBootstrap
26452741

26462742

26472743
/***/ }),
2648-
/* 17 */
2744+
/* 18 */
26492745
/***/ (function(module, exports, __webpack_require__) {
26502746

26512747
'use strict';
26522748

26532749
var React = __webpack_require__(12),
26542750
createClass = __webpack_require__(11),
2655-
moment = __webpack_require__(15),
2656-
onClickOutside = __webpack_require__(18).default
2751+
moment = __webpack_require__(16),
2752+
onClickOutside = __webpack_require__(19).default
26572753
;
26582754

26592755
var DateTimePickerDays = onClickOutside( createClass({
@@ -2668,7 +2764,7 @@ return /******/ (function(modules) { // webpackBootstrap
26682764
React.createElement('thead', { key: 'th' }, [
26692765
React.createElement('tr', { key: 'h' }, [
26702766
React.createElement('th', { key: 'p', className: 'rdtPrev', onClick: this.props.subtractTime( 1, 'months' )}, React.createElement('span', {}, '‹' )),
2671-
React.createElement('th', { key: 's', className: 'rdtSwitch', onClick: this.props.showView( 'months' ), colSpan: 5, 'data-value': this.props.viewDate.month() }, locale.months( date ) + ' ' + date.year() ),
2767+
React.createElement('th', { key: 's', className: 'rdtSwitch', onClick: this.props.showView( 'months' ), colspan: 5, 'data-value': this.props.viewDate.month() }, locale.months( date ) + ' ' + date.year() ),
26722768
React.createElement('th', { key: 'n', className: 'rdtNext', onClick: this.props.addTime( 1, 'months' )}, React.createElement('span', {}, '›' ))
26732769
]),
26742770
React.createElement('tr', { key: 'd'}, this.getDaysOfWeek( locale ).map( function( day, index ) { return React.createElement('th', { key: day + index, className: 'dow'}, day ); }) )
@@ -2777,7 +2873,7 @@ return /******/ (function(modules) { // webpackBootstrap
27772873

27782874
return React.createElement('tfoot', { key: 'tf'},
27792875
React.createElement('tr', {},
2780-
React.createElement('td', { onClick: this.props.showView( 'time' ), colSpan: 7, className: 'rdtTimeToggle' }, date.format( this.props.timeFormat ))
2876+
React.createElement('td', { onClick: this.props.showView( 'time' ), colspan: 7, className: 'rdtTimeToggle' }, date.format( this.props.timeFormat ))
27812877
)
27822878
);
27832879
},
@@ -2795,7 +2891,7 @@ return /******/ (function(modules) { // webpackBootstrap
27952891

27962892

27972893
/***/ }),
2798-
/* 18 */
2894+
/* 19 */
27992895
/***/ (function(module, exports, __webpack_require__) {
28002896

28012897
'use strict';
@@ -2806,9 +2902,9 @@ return /******/ (function(modules) { // webpackBootstrap
28062902

28072903
var _react = __webpack_require__(12);
28082904

2809-
var _reactDom = __webpack_require__(19);
2905+
var _reactDom = __webpack_require__(20);
28102906

2811-
var _generateOutsideCheck = __webpack_require__(20);
2907+
var _generateOutsideCheck = __webpack_require__(21);
28122908

28132909
var _generateOutsideCheck2 = _interopRequireDefault(_generateOutsideCheck);
28142910

@@ -3054,13 +3150,13 @@ return /******/ (function(modules) { // webpackBootstrap
30543150
}
30553151

30563152
/***/ }),
3057-
/* 19 */
3153+
/* 20 */
30583154
/***/ (function(module, exports) {
30593155

3060-
module.exports = __WEBPACK_EXTERNAL_MODULE_19__;
3156+
module.exports = __WEBPACK_EXTERNAL_MODULE_20__;
30613157

30623158
/***/ }),
3063-
/* 20 */
3159+
/* 21 */
30643160
/***/ (function(module, exports) {
30653161

30663162
"use strict";
@@ -3137,22 +3233,22 @@ return /******/ (function(modules) { // webpackBootstrap
31373233
}
31383234

31393235
/***/ }),
3140-
/* 21 */
3236+
/* 22 */
31413237
/***/ (function(module, exports, __webpack_require__) {
31423238

31433239
'use strict';
31443240

31453241
var React = __webpack_require__(12),
31463242
createClass = __webpack_require__(11),
3147-
onClickOutside = __webpack_require__(18).default
3243+
onClickOutside = __webpack_require__(19).default
31483244
;
31493245

31503246
var DateTimePickerMonths = onClickOutside( createClass({
31513247
render: function() {
31523248
return React.createElement('div', { className: 'rdtMonths' }, [
31533249
React.createElement('table', { key: 'a' }, React.createElement('thead', {}, React.createElement('tr', {}, [
31543250
React.createElement('th', { key: 'prev', className: 'rdtPrev', onClick: this.props.subtractTime( 1, 'years' )}, React.createElement('span', {}, '‹' )),
3155-
React.createElement('th', { key: 'year', className: 'rdtSwitch', onClick: this.props.showView( 'years' ), colSpan: 2, 'data-value': this.props.viewDate.year() }, this.props.viewDate.year() ),
3251+
React.createElement('th', { key: 'year', className: 'rdtSwitch', onClick: this.props.showView( 'years' ), colspan: 2, 'data-value': this.props.viewDate.year() }, this.props.viewDate.year() ),
31563252
React.createElement('th', { key: 'next', className: 'rdtNext', onClick: this.props.addTime( 1, 'years' )}, React.createElement('span', {}, '›' ))
31573253
]))),
31583254
React.createElement('table', { key: 'months' }, React.createElement('tbody', { key: 'b' }, this.renderMonths()))
@@ -3250,14 +3346,14 @@ return /******/ (function(modules) { // webpackBootstrap
32503346

32513347

32523348
/***/ }),
3253-
/* 22 */
3349+
/* 23 */
32543350
/***/ (function(module, exports, __webpack_require__) {
32553351

32563352
'use strict';
32573353

32583354
var React = __webpack_require__(12),
32593355
createClass = __webpack_require__(11),
3260-
onClickOutside = __webpack_require__(18).default
3356+
onClickOutside = __webpack_require__(19).default
32613357
;
32623358

32633359
var DateTimePickerYears = onClickOutside( createClass({
@@ -3267,7 +3363,7 @@ return /******/ (function(modules) { // webpackBootstrap
32673363
return React.createElement('div', { className: 'rdtYears' }, [
32683364
React.createElement('table', { key: 'a' }, React.createElement('thead', {}, React.createElement('tr', {}, [
32693365
React.createElement('th', { key: 'prev', className: 'rdtPrev', onClick: this.props.subtractTime( 10, 'years' )}, React.createElement('span', {}, '‹' )),
3270-
React.createElement('th', { key: 'year', className: 'rdtSwitch', onClick: this.props.showView( 'years' ), colSpan: 2 }, year + '-' + ( year + 9 ) ),
3366+
React.createElement('th', { key: 'year', className: 'rdtSwitch', onClick: this.props.showView( 'years' ), colspan: 2 }, year + '-' + ( year + 9 ) ),
32713367
React.createElement('th', { key: 'next', className: 'rdtNext', onClick: this.props.addTime( 10, 'years' )}, React.createElement('span', {}, '›' ))
32723368
]))),
32733369
React.createElement('table', { key: 'years' }, React.createElement('tbody', {}, this.renderYears( year )))
@@ -3361,15 +3457,15 @@ return /******/ (function(modules) { // webpackBootstrap
33613457

33623458

33633459
/***/ }),
3364-
/* 23 */
3460+
/* 24 */
33653461
/***/ (function(module, exports, __webpack_require__) {
33663462

33673463
'use strict';
33683464

33693465
var React = __webpack_require__(12),
33703466
createClass = __webpack_require__(11),
33713467
assign = __webpack_require__(1),
3372-
onClickOutside = __webpack_require__(18).default
3468+
onClickOutside = __webpack_require__(19).default
33733469
;
33743470

33753471
var DateTimePickerTime = onClickOutside( createClass({
@@ -3394,7 +3490,7 @@ return /******/ (function(modules) { // webpackBootstrap
33943490
}
33953491

33963492
var hours = date.format( 'H' );
3397-
3493+
33983494
var daypart = false;
33993495
if ( this.state !== null && this.props.timeFormat.toLowerCase().indexOf( ' a' ) !== -1 ) {
34003496
if ( this.props.timeFormat.indexOf( ' A' ) !== -1 ) {
@@ -3523,7 +3619,7 @@ return /******/ (function(modules) { // webpackBootstrap
35233619

35243620
var date = this.props.selectedDate || this.props.viewDate;
35253621
return React.createElement('thead', { key: 'h' }, React.createElement('tr', {},
3526-
React.createElement('th', { className: 'rdtSwitch', colSpan: 4, onClick: this.props.showView( 'days' ) }, date.format( this.props.dateFormat ) )
3622+
React.createElement('th', { className: 'rdtSwitch', colspan: 4, onClick: this.props.showView( 'days' ) }, date.format( this.props.dateFormat ) )
35273623
));
35283624
},
35293625

‎dist/react-datetime.min.js

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

‎dist/react-datetime.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)