Skip to content

Commit ffc68a6

Browse files
author
Hwashiang Yu
committed
MC-4232: Button text draggable triggers the image drop zones
- Added conditional to prevent error failures - Updated conditional to allow all image/ data type to show the placeholder - Reverted image uploader script
1 parent c20c542 commit ffc68a6

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.js

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,19 @@ define([
9595
* @param {jQuery.event} e
9696
*/
9797
highlightDropzone: function (e) {
98-
var draggedItem = e.originalEvent.dataTransfer.items[0],
98+
var draggedItem,
9999
$dropzone = $(e.target).closest(this.dropZone),
100100
$otherDropzones = $(this.dropZone).not($dropzone),
101101
isInsideDropzone = !!$dropzone.length;
102102

103-
if (draggedItem.kind === 'file' &&
104-
(draggedItem.type === 'image/png' ||
105-
draggedItem.type === 'image/gif' ||
106-
draggedItem.type === 'image/jpg')
103+
if (!e.originalEvent.dataTransfer.items.length
107104
) {
105+
return false;
106+
}
107+
108+
draggedItem = e.originalEvent.dataTransfer.items[0];
109+
110+
if (draggedItem.kind === 'file' && /image\//.test(draggedItem.type)) {
108111
if (isInsideDropzone) {
109112
$dropzone
110113
.removeClass(this.classes.draggingOutside)
@@ -185,6 +188,7 @@ define([
185188
*/
186189
updateResponsiveClasses: function () {
187190
var classesToAdd = [],
191+
classConfig,
188192
elementWidth = this.$uploadArea.width(),
189193
modifierClass;
190194

@@ -195,17 +199,16 @@ define([
195199
this.$uploadArea.removeClass(Object.keys(this.elementWidthModifierClasses).join(' '));
196200

197201
for (modifierClass in this.elementWidthModifierClasses) {
198-
if (this.elementWidthModifierClasses.hasOwnProperty(modifierClass) && (
199-
this.elementWidthModifierClasses[modifierClass].minWidth &&
200-
this.elementWidthModifierClasses[modifierClass].maxWidth &&
201-
(this.elementWidthModifierClasses[modifierClass].minWidth <= elementWidth &&
202-
elementWidth <= this.elementWidthModifierClasses[modifierClass].maxWidth) ||
203-
this.elementWidthModifierClasses[modifierClass].minWidth &&
204-
!this.elementWidthModifierClasses[modifierClass].maxWidth &&
205-
this.elementWidthModifierClasses[modifierClass].minWidth <= elementWidth ||
206-
this.elementWidthModifierClasses[modifierClass].maxWidth &&
207-
!this.elementWidthModifierClasses[modifierClass].minWidth &&
208-
elementWidth <= this.elementWidthModifierClasses[modifierClass].maxWidth)
202+
if (!this.elementWidthModifierClasses.hasOwnProperty(modifierClass)) {
203+
continue;
204+
}
205+
206+
classConfig = this.elementWidthModifierClasses[modifierClass];
207+
208+
if (classConfig.minWidth && classConfig.maxWidth &&
209+
(classConfig.minWidth <= elementWidth && elementWidth <= classConfig.maxWidth) ||
210+
classConfig.minWidth && !classConfig.maxWidth && classConfig.minWidth <= elementWidth ||
211+
classConfig.maxWidth && !classConfig.minWidth && elementWidth <= classConfig.maxWidth
209212
) {
210213
classesToAdd.push(modifierClass);
211214
}

0 commit comments

Comments
 (0)