From 99929e8c706aa7f6196ac4e02df1c04449feee7a Mon Sep 17 00:00:00 2001
From: Anna Kurylo <akurylo@redhat.com>
Date: Tue, 16 Oct 2018 10:05:58 +0200
Subject: [PATCH] :bug: fix colspan property to work with XML layout
---
dist/react-datetime.js | 162 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 129 insertions(+), 33 deletions(-)
diff --git a/dist/react-datetime.js b/dist/react-datetime.js
index 65dc71c..ac66943 100644
--- a/dist/react-datetime.js
+++ b/dist/react-datetime.js
@@ -12,7 +12,7 @@
exports["Datetime"] = factory(require("React"), require("moment"), require("ReactDOM"));
else
root["Datetime"] = factory(root["React"], root["moment"], root["ReactDOM"]);
-})(this, function(__WEBPACK_EXTERNAL_MODULE_12__, __WEBPACK_EXTERNAL_MODULE_15__, __WEBPACK_EXTERNAL_MODULE_19__) {
+})(this, function(__WEBPACK_EXTERNAL_MODULE_12__, __WEBPACK_EXTERNAL_MODULE_16__, __WEBPACK_EXTERNAL_MODULE_20__) {
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@@ -64,9 +64,9 @@
var assign = __webpack_require__(1),
PropTypes = __webpack_require__(2),
createClass = __webpack_require__(11),
- moment = __webpack_require__(15),
+ moment = __webpack_require__(16),
React = __webpack_require__(12),
- CalendarContainer = __webpack_require__(16)
+ CalendarContainer = __webpack_require__(17)
;
var viewModes = Object.freeze({
@@ -1720,9 +1720,9 @@
'use strict';
- var _assign = __webpack_require__(1);
+ var _assign = __webpack_require__(14);
- var emptyObject = __webpack_require__(14);
+ var emptyObject = __webpack_require__(15);
var _invariant = __webpack_require__(6);
if (process.env.NODE_ENV !== 'production') {
@@ -2585,6 +2585,102 @@
/***/ }),
/* 14 */
+/***/ (function(module, exports) {
+
+ /*
+ object-assign
+ (c) Sindre Sorhus
+ @license MIT
+ */
+
+ 'use strict';
+ /* eslint-disable no-unused-vars */
+ var getOwnPropertySymbols = Object.getOwnPropertySymbols;
+ var hasOwnProperty = Object.prototype.hasOwnProperty;
+ var propIsEnumerable = Object.prototype.propertyIsEnumerable;
+
+ function toObject(val) {
+ if (val === null || val === undefined) {
+ throw new TypeError('Object.assign cannot be called with null or undefined');
+ }
+
+ return Object(val);
+ }
+
+ function shouldUseNative() {
+ try {
+ if (!Object.assign) {
+ return false;
+ }
+
+ // Detect buggy property enumeration order in older V8 versions.
+
+ // https://bugs.chromium.org/p/v8/issues/detail?id=4118
+ var test1 = new String('abc'); // eslint-disable-line no-new-wrappers
+ test1[5] = 'de';
+ if (Object.getOwnPropertyNames(test1)[0] === '5') {
+ return false;
+ }
+
+ // https://bugs.chromium.org/p/v8/issues/detail?id=3056
+ var test2 = {};
+ for (var i = 0; i < 10; i++) {
+ test2['_' + String.fromCharCode(i)] = i;
+ }
+ var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
+ return test2[n];
+ });
+ if (order2.join('') !== '0123456789') {
+ return false;
+ }
+
+ // https://bugs.chromium.org/p/v8/issues/detail?id=3056
+ var test3 = {};
+ 'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
+ test3[letter] = letter;
+ });
+ if (Object.keys(Object.assign({}, test3)).join('') !==
+ 'abcdefghijklmnopqrst') {
+ return false;
+ }
+
+ return true;
+ } catch (err) {
+ // We don't expect any of the above to throw, but better to be safe.
+ return false;
+ }
+ }
+
+ module.exports = shouldUseNative() ? Object.assign : function (target, source) {
+ var from;
+ var to = toObject(target);
+ var symbols;
+
+ for (var s = 1; s < arguments.length; s++) {
+ from = Object(arguments[s]);
+
+ for (var key in from) {
+ if (hasOwnProperty.call(from, key)) {
+ to[key] = from[key];
+ }
+ }
+
+ if (getOwnPropertySymbols) {
+ symbols = getOwnPropertySymbols(from);
+ for (var i = 0; i < symbols.length; i++) {
+ if (propIsEnumerable.call(from, symbols[i])) {
+ to[symbols[i]] = from[symbols[i]];
+ }
+ }
+ }
+ }
+
+ return to;
+ };
+
+
+/***/ }),
+/* 15 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(process) {/**
@@ -2609,23 +2705,23 @@
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(3)))
/***/ }),
-/* 15 */
+/* 16 */
/***/ (function(module, exports) {
- module.exports = __WEBPACK_EXTERNAL_MODULE_15__;
+ module.exports = __WEBPACK_EXTERNAL_MODULE_16__;
/***/ }),
-/* 16 */
+/* 17 */
/***/ (function(module, exports, __webpack_require__) {
'use strict';
var React = __webpack_require__(12),
createClass = __webpack_require__(11),
- DaysView = __webpack_require__(17),
- MonthsView = __webpack_require__(21),
- YearsView = __webpack_require__(22),
- TimeView = __webpack_require__(23)
+ DaysView = __webpack_require__(18),
+ MonthsView = __webpack_require__(22),
+ YearsView = __webpack_require__(23),
+ TimeView = __webpack_require__(24)
;
var CalendarContainer = createClass({
@@ -2645,15 +2741,15 @@
/***/ }),
-/* 17 */
+/* 18 */
/***/ (function(module, exports, __webpack_require__) {
'use strict';
var React = __webpack_require__(12),
createClass = __webpack_require__(11),
- moment = __webpack_require__(15),
- onClickOutside = __webpack_require__(18).default
+ moment = __webpack_require__(16),
+ onClickOutside = __webpack_require__(19).default
;
var DateTimePickerDays = onClickOutside( createClass({
@@ -2668,7 +2764,7 @@
React.createElement('thead', { key: 'th' }, [
React.createElement('tr', { key: 'h' }, [
React.createElement('th', { key: 'p', className: 'rdtPrev', onClick: this.props.subtractTime( 1, 'months' )}, React.createElement('span', {}, '���' )),
- 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() ),
+ 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() ),
React.createElement('th', { key: 'n', className: 'rdtNext', onClick: this.props.addTime( 1, 'months' )}, React.createElement('span', {}, '���' ))
]),
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 React.createElement('tfoot', { key: 'tf'},
React.createElement('tr', {},
- React.createElement('td', { onClick: this.props.showView( 'time' ), colSpan: 7, className: 'rdtTimeToggle' }, date.format( this.props.timeFormat ))
+ React.createElement('td', { onClick: this.props.showView( 'time' ), colspan: 7, className: 'rdtTimeToggle' }, date.format( this.props.timeFormat ))
)
);
},
@@ -2795,7 +2891,7 @@
/***/ }),
-/* 18 */
+/* 19 */
/***/ (function(module, exports, __webpack_require__) {
'use strict';
@@ -2806,9 +2902,9 @@
var _react = __webpack_require__(12);
- var _reactDom = __webpack_require__(19);
+ var _reactDom = __webpack_require__(20);
- var _generateOutsideCheck = __webpack_require__(20);
+ var _generateOutsideCheck = __webpack_require__(21);
var _generateOutsideCheck2 = _interopRequireDefault(_generateOutsideCheck);
@@ -3054,13 +3150,13 @@
}
/***/ }),
-/* 19 */
+/* 20 */
/***/ (function(module, exports) {
- module.exports = __WEBPACK_EXTERNAL_MODULE_19__;
+ module.exports = __WEBPACK_EXTERNAL_MODULE_20__;
/***/ }),
-/* 20 */
+/* 21 */
/***/ (function(module, exports) {
"use strict";
@@ -3137,14 +3233,14 @@
}
/***/ }),
-/* 21 */
+/* 22 */
/***/ (function(module, exports, __webpack_require__) {
'use strict';
var React = __webpack_require__(12),
createClass = __webpack_require__(11),
- onClickOutside = __webpack_require__(18).default
+ onClickOutside = __webpack_require__(19).default
;
var DateTimePickerMonths = onClickOutside( createClass({
@@ -3152,7 +3248,7 @@
return React.createElement('div', { className: 'rdtMonths' }, [
React.createElement('table', { key: 'a' }, React.createElement('thead', {}, React.createElement('tr', {}, [
React.createElement('th', { key: 'prev', className: 'rdtPrev', onClick: this.props.subtractTime( 1, 'years' )}, React.createElement('span', {}, '���' )),
- React.createElement('th', { key: 'year', className: 'rdtSwitch', onClick: this.props.showView( 'years' ), colSpan: 2, 'data-value': this.props.viewDate.year() }, this.props.viewDate.year() ),
+ React.createElement('th', { key: 'year', className: 'rdtSwitch', onClick: this.props.showView( 'years' ), colspan: 2, 'data-value': this.props.viewDate.year() }, this.props.viewDate.year() ),
React.createElement('th', { key: 'next', className: 'rdtNext', onClick: this.props.addTime( 1, 'years' )}, React.createElement('span', {}, '���' ))
]))),
React.createElement('table', { key: 'months' }, React.createElement('tbody', { key: 'b' }, this.renderMonths()))
@@ -3250,14 +3346,14 @@
/***/ }),
-/* 22 */
+/* 23 */
/***/ (function(module, exports, __webpack_require__) {
'use strict';
var React = __webpack_require__(12),
createClass = __webpack_require__(11),
- onClickOutside = __webpack_require__(18).default
+ onClickOutside = __webpack_require__(19).default
;
var DateTimePickerYears = onClickOutside( createClass({
@@ -3267,7 +3363,7 @@
return React.createElement('div', { className: 'rdtYears' }, [
React.createElement('table', { key: 'a' }, React.createElement('thead', {}, React.createElement('tr', {}, [
React.createElement('th', { key: 'prev', className: 'rdtPrev', onClick: this.props.subtractTime( 10, 'years' )}, React.createElement('span', {}, '���' )),
- React.createElement('th', { key: 'year', className: 'rdtSwitch', onClick: this.props.showView( 'years' ), colSpan: 2 }, year + '-' + ( year + 9 ) ),
+ React.createElement('th', { key: 'year', className: 'rdtSwitch', onClick: this.props.showView( 'years' ), colspan: 2 }, year + '-' + ( year + 9 ) ),
React.createElement('th', { key: 'next', className: 'rdtNext', onClick: this.props.addTime( 10, 'years' )}, React.createElement('span', {}, '���' ))
]))),
React.createElement('table', { key: 'years' }, React.createElement('tbody', {}, this.renderYears( year )))
@@ -3361,7 +3457,7 @@
/***/ }),
-/* 23 */
+/* 24 */
/***/ (function(module, exports, __webpack_require__) {
'use strict';
@@ -3369,7 +3465,7 @@
var React = __webpack_require__(12),
createClass = __webpack_require__(11),
assign = __webpack_require__(1),
- onClickOutside = __webpack_require__(18).default
+ onClickOutside = __webpack_require__(19).default
;
var DateTimePickerTime = onClickOutside( createClass({
@@ -3394,7 +3490,7 @@
}
var hours = date.format( 'H' );
-
+
var daypart = false;
if ( this.state !== null && this.props.timeFormat.toLowerCase().indexOf( ' a' ) !== -1 ) {
if ( this.props.timeFormat.indexOf( ' A' ) !== -1 ) {
@@ -3523,7 +3619,7 @@
var date = this.props.selectedDate || this.props.viewDate;
return React.createElement('thead', { key: 'h' }, React.createElement('tr', {},
- React.createElement('th', { className: 'rdtSwitch', colSpan: 4, onClick: this.props.showView( 'days' ) }, date.format( this.props.dateFormat ) )
+ React.createElement('th', { className: 'rdtSwitch', colspan: 4, onClick: this.props.showView( 'days' ) }, date.format( this.props.dateFormat ) )
));
},
--
Gitblit v1.9.3