Skip to content

Commit 768b444

Browse files
authored
Merge pull request #9716 from magento-gl/AC-14304
AC-14304::Investigate the latest version chart.js
2 parents 33fd6ee + 9bc1a5e commit 768b444

File tree

3 files changed

+59
-57
lines changed

3 files changed

+59
-57
lines changed

dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

+2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ lib/web/jquery/jquery.validate.js
1717
lib/web/prototype/**/*.js
1818
lib/web/jquery/jstree/jquery.jstree.js
1919
lib/web/jquery/colorpicker/js/colorpicker.js
20+
lib/web/chartjs/chartjs-adapter-moment.js
2021

2122
// MINIFIED FILES
2223
app/code/**/*.min.js
2324
lib/web/legacy-build.min.js
2425
lib/web/tiny_mce_6/**/*.js
2526
lib/web/tiny_mce_6/***/*.js
2627
lib/web/jquery/uppy/dist/uppy.min.js
28+
lib/web/chartjs/Chart.min.js
2729

2830
// TEST
2931
vendor/magento/magento-coding-standard/Magento2/Tests/Eslint/*

lib/web/chartjs/Chart.min.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+53-53
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
11
/*!
2-
* chartjs-adapter-moment v1.0.0
2+
* chartjs-adapter-moment v1.0.1
33
* https://www.chartjs.org
4-
* (c) 2021 chartjs-adapter-moment Contributors
4+
* (c) 2022 chartjs-adapter-moment Contributors
55
* Released under the MIT license
66
*/
77
(function (global, factory) {
8-
typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('moment'), require('chart.js')) :
9-
typeof define === 'function' && define.amd ? define(['moment', 'chart.js'], factory) :
10-
(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.moment, global.Chart));
8+
typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('moment'), require('chart.js')) :
9+
typeof define === 'function' && define.amd ? define(['moment', 'chart.js'], factory) :
10+
(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.moment, global.Chart));
1111
}(this, (function (moment, chart_js) { 'use strict';
1212

13-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
13+
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
1414

15-
var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
15+
var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
1616

17-
const FORMATS = {
18-
datetime: 'MMM D, YYYY, h:mm:ss a',
19-
millisecond: 'h:mm:ss.SSS a',
20-
second: 'h:mm:ss a',
21-
minute: 'h:mm a',
22-
hour: 'hA',
23-
day: 'MMM D',
24-
week: 'll',
25-
month: 'MMM YYYY',
26-
quarter: '[Q]Q - YYYY',
27-
year: 'YYYY'
28-
};
17+
const FORMATS = {
18+
datetime: 'MMM D, YYYY, h:mm:ss a',
19+
millisecond: 'h:mm:ss.SSS a',
20+
second: 'h:mm:ss a',
21+
minute: 'h:mm a',
22+
hour: 'hA',
23+
day: 'MMM D',
24+
week: 'll',
25+
month: 'MMM YYYY',
26+
quarter: '[Q]Q - YYYY',
27+
year: 'YYYY'
28+
};
2929

30-
chart_js._adapters._date.override(typeof moment__default['default'] === 'function' ? {
31-
_id: 'moment', // DEBUG ONLY
30+
chart_js._adapters._date.override(typeof moment__default['default'] === 'function' ? {
31+
_id: 'moment', // DEBUG ONLY
3232

33-
formats: function() {
34-
return FORMATS;
35-
},
33+
formats: function() {
34+
return FORMATS;
35+
},
3636

37-
parse: function(value, format) {
38-
if (typeof value === 'string' && typeof format === 'string') {
39-
value = moment__default['default'](value, format);
40-
} else if (!(value instanceof moment__default['default'])) {
41-
value = moment__default['default'](value);
42-
}
43-
return value.isValid() ? value.valueOf() : null;
44-
},
37+
parse: function(value, format) {
38+
if (typeof value === 'string' && typeof format === 'string') {
39+
value = moment__default['default'](value, format);
40+
} else if (!(value instanceof moment__default['default'])) {
41+
value = moment__default['default'](value);
42+
}
43+
return value.isValid() ? value.valueOf() : null;
44+
},
4545

46-
format: function(time, format) {
47-
return moment__default['default'](time).format(format);
48-
},
46+
format: function(time, format) {
47+
return moment__default['default'](time).format(format);
48+
},
4949

50-
add: function(time, amount, unit) {
51-
return moment__default['default'](time).add(amount, unit).valueOf();
52-
},
50+
add: function(time, amount, unit) {
51+
return moment__default['default'](time).add(amount, unit).valueOf();
52+
},
5353

54-
diff: function(max, min, unit) {
55-
return moment__default['default'](max).diff(moment__default['default'](min), unit);
56-
},
54+
diff: function(max, min, unit) {
55+
return moment__default['default'](max).diff(moment__default['default'](min), unit);
56+
},
5757

58-
startOf: function(time, unit, weekday) {
59-
time = moment__default['default'](time);
60-
if (unit === 'isoWeek') {
61-
weekday = Math.trunc(Math.min(Math.max(0, weekday), 6));
62-
return time.isoWeekday(weekday).startOf('day').valueOf();
63-
}
64-
return time.startOf(unit).valueOf();
65-
},
58+
startOf: function(time, unit, weekday) {
59+
time = moment__default['default'](time);
60+
if (unit === 'isoWeek') {
61+
weekday = Math.trunc(Math.min(Math.max(0, weekday), 6));
62+
return time.isoWeekday(weekday).startOf('day').valueOf();
63+
}
64+
return time.startOf(unit).valueOf();
65+
},
6666

67-
endOf: function(time, unit) {
68-
return moment__default['default'](time).endOf(unit).valueOf();
69-
}
70-
} : {});
67+
endOf: function(time, unit) {
68+
return moment__default['default'](time).endOf(unit).valueOf();
69+
}
70+
} : {});
7171

7272
})));

0 commit comments

Comments
 (0)