Skip to content

Commit 8058f94

Browse files
committed
Merge remote-tracking branch 'trigger/AC-1544' into ph-delivery
2 parents ee2e49d + 4be8fcd commit 8058f94

File tree

143 files changed

+21140
-19548
lines changed

Some content is hidden

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

143 files changed

+21140
-19548
lines changed

app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,6 @@ define([
130130
return this._player.playing();
131131
},
132132

133-
/**
134-
* Destroyer
135-
*/
136-
destroy: function () {
137-
this._player.destroy();
138-
},
139-
140133
/**
141134
* Calculates ratio for responsive videos
142135
* @private
@@ -300,9 +293,8 @@ define([
300293
* stops and unloads player
301294
* @private
302295
*/
303-
destroy: function () {
296+
_destroy: function () {
304297
this.stop();
305-
this._player.destroy();
306298
}
307299
});
308300

app/code/Magento/Theme/view/adminhtml/requirejs-config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ var config = {
8888
'mage/backend/bootstrap',
8989
'mage/adminhtml/globals'
9090
],
91+
config: {
92+
mixins: {
93+
'jquery/jquery-ui': {
94+
'jquery/patches/jquery-ui-sortable': true
95+
}
96+
}
97+
},
9198
'paths': {
9299
'jquery/ui': 'jquery/jquery-ui'
93100
}

app/code/Magento/Theme/view/frontend/requirejs-config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ var config = {
4040
mixins: {
4141
'Magento_Theme/js/view/breadcrumbs': {
4242
'Magento_Theme/js/view/add-home-breadcrumb': true
43+
},
44+
'jquery/ui-modules/widgets/sortable': {
45+
'jquery/patches/jquery-ui-sortable': true
4346
}
4447
}
4548
}

app/design/adminhtml/Magento/backend/web/css/source/components/_calendar-temp.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,3 +403,7 @@
403403
margin: 0;
404404
padding: 0;
405405
}
406+
407+
.ui-timepicker-div .ui_tpicker_unit_hide {
408+
display:none;
409+
}

0 commit comments

Comments
 (0)