Skip to content

Commit 77bfde9

Browse files
authored
Merge pull request #6992 from magento-commerce/platform-health
[Platform Health] Dependency Updates
2 parents 70d1517 + 404a4e2 commit 77bfde9

File tree

79 files changed

+2515
-6056
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2515
-6056
lines changed

app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if ($isField) {
9191

9292
<?php if ($element->hasAdvanced() && !$isField) : ?>
9393
<?= (!$element->getNoContainer() && $advancedAfter) ? '</fieldset>' : '' ?>
94-
<details data-mage-init='{"details": {}}' class="details admin__collapsible-block-wrapper" id="details<?= /* @noEscape */ $id ?>">
94+
<details class="details admin__collapsible-block-wrapper" id="details<?= /* @noEscape */ $id ?>">
9595
<summary class="details-summary admin__collapsible-title" id="details-summary<?= /* @noEscape */ $id ?>">
9696
<span><?= $block->escapeHtml($advancedLabel) ?></span>
9797
</summary>

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ define([
99
'jquery',
1010
'chartJs',
1111
'jquery-ui-modules/widget',
12+
'chartjs/chartjs-adapter-moment',
1213
'moment'
1314
], function ($, Chart) {
1415
'use strict';
@@ -74,7 +75,7 @@ define([
7475
$(this.element).toggle(response.data.length > 0);
7576
$(this.element).next('.dashboard-diagram-nodata').toggle(response.data.length === 0);
7677

77-
this.chart.options.scales.xAxes[0].time.unit = this.options.periodUnits[this.period] ?
78+
this.chart.options.scales.xAxis.time.unit = this.options.periodUnits[this.period] ?
7879
this.options.periodUnits[this.period] : 'hour';
7980
this.chart.data.datasets[0].data = response.data;
8081
this.chart.data.datasets[0].label = response.label;
@@ -89,6 +90,8 @@ define([
8990
type: 'bar',
9091
data: {
9192
datasets: [{
93+
yAxisID: 'yAxis',
94+
xAxisID: 'xAxis',
9295
data: [],
9396
backgroundColor: '#f1d4b3',
9497
borderColor: '#eb5202',
@@ -101,20 +104,19 @@ define([
101104
position: 'bottom'
102105
},
103106
scales: {
104-
xAxes: [{
107+
xAxis: {
105108
offset: true,
106109
type: 'time',
107110
ticks: {
108-
autoSkip: true,
109111
source: 'data'
110112
}
111-
}],
112-
yAxes: [{
113+
},
114+
yAxis: {
113115
ticks: {
114116
beginAtZero: true,
115117
precision: this.options.precision
116118
}
117-
}]
119+
}
118120
}
119121
}
120122
};

app/code/Magento/Bundle/view/frontend/web/js/float.js

Lines changed: 0 additions & 62 deletions
This file was deleted.

app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js

Lines changed: 0 additions & 88 deletions
This file was deleted.

app/code/Magento/Catalog/view/adminhtml/web/js/components/input-handle-required.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

app/code/Magento/Catalog/view/adminhtml/web/js/components/multiselect-handle-required.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

app/code/Magento/Catalog/view/adminhtml/web/js/components/product-status.js

Lines changed: 0 additions & 78 deletions
This file was deleted.

app/code/Magento/Catalog/view/adminhtml/web/js/components/select-handle-required.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)