Skip to content

Commit 89c5bfe

Browse files
committed
MAGETWO-96412: [2.3.x] Not possible to drag specified Related/Upsell/Cross-sell products to new positions in Windows 10 machine
- Fixed js
1 parent 70a5fcb commit 89c5bfe

File tree

1 file changed

+13
-6
lines changed
  • app/code/Magento/Ui/view/base/web/js/dynamic-rows

1 file changed

+13
-6
lines changed

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ define([
120120
* @param {Object} event - key down event
121121
*/
122122
mousedownHandler: function (data, elem, event) {
123-
this.disableScroll();
124123
var recordNode = this.getRecordNode(elem),
125124
originRecord = $(elem).parents('tr').eq(0),
126125
drEl = this.draggableElement,
127126
$table = $(elem).parents('table').eq(0),
128127
$tableWrapper = $table.parent();
129128

129+
this.disableScroll();
130130
$(recordNode).addClass(this.draggableElementClass);
131131
$(originRecord).addClass(this.draggableElementClass);
132132
this.step = this.step === 'auto' ? originRecord.height() / 2 : this.step;
@@ -178,12 +178,12 @@ define([
178178
* Mouse up handler
179179
*/
180180
mouseupHandler: function (event) {
181-
this.enableScroll();
182181
var depElementCtx,
183182
drEl = this.draggableElement,
184183
pageY = this.getPageY(event),
185184
positionY = pageY - drEl.eventMousedownY;
186185

186+
this.enableScroll();
187187
drEl.depElement = this.getDepElement(drEl.instance, positionY, this.draggableElement.originRow);
188188

189189
drEl.instance.remove();
@@ -385,14 +385,16 @@ define([
385385

386386
return this.recordsCache()[index];
387387
},
388+
388389
/**
389390
* Get correct page Y
390391
*
391392
* @param {Object} event - current event
392393
* @returns {integer}
393394
*/
394-
getPageY: function(event) {
395-
let pageY;
395+
getPageY: function (event) {
396+
var pageY;
397+
396398
if (event.type.indexOf('touch') >= 0) {
397399
if (event.originalEvent.touches[0]) {
398400
pageY = event.originalEvent.touches[0].pageY;
@@ -402,21 +404,26 @@ define([
402404
} else {
403405
pageY = event.pageY;
404406
}
407+
405408
return pageY;
406409
},
407410

408411
/**
409412
* Disable page scrolling
410413
*/
411414
disableScroll: function () {
412-
document.body.addEventListener('touchmove', this.preventDefault, { passive: false });
415+
document.body.addEventListener('touchmove', this.preventDefault, {
416+
passive: false
417+
});
413418
},
414419

415420
/**
416421
* Enable page scrolling
417422
*/
418423
enableScroll: function () {
419-
document.body.removeEventListener('touchmove', this.preventDefault, { passive: false });
424+
document.body.removeEventListener('touchmove', this.preventDefault, {
425+
passive: false
426+
});
420427
},
421428

422429
/**

0 commit comments

Comments
 (0)