diff options
author | Phil Hughes <me@iamphill.com> | 2016-08-11 11:18:19 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-08-17 17:17:39 +0100 |
commit | 7124e510eb71a441ede7aca02d0f86b9722ea8eb (patch) | |
tree | bb6ca0d1aac0930a8836a928842bccb238c422a6 | |
parent | 17c576c1acaaa976e4ef99c18d0ff0f3cda4fec4 (diff) | |
download | gitlab-ce-7124e510eb71a441ede7aca02d0f86b9722ea8eb.tar.gz |
Updated simulateDrag JS
-rwxr-xr-x | app/assets/javascripts/boards/test_utils/simulate_drag.js | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/app/assets/javascripts/boards/test_utils/simulate_drag.js b/app/assets/javascripts/boards/test_utils/simulate_drag.js index 7cfdba873c6..3db593f8333 100755 --- a/app/assets/javascripts/boards/test_utils/simulate_drag.js +++ b/app/assets/javascripts/boards/test_utils/simulate_drag.js @@ -85,14 +85,10 @@ simulateEvent(fromEl, 'mousedown', {button: 0}); options.ontap && options.ontap(); - requestAnimationFrame(function () { - options.ondragstart && options.ondragstart(); - }); - - requestAnimationFrame(function loop() { + var dragInterval = setInterval(function loop() { var progress = (new Date().getTime() - startTime) / duration; var x = (fromRect.cx + (toRect.cx - fromRect.cx) * progress) - scrollable.scrollLeft; - var y = fromRect.cy + (toRect.cy - fromRect.cy) * progress; + var y = (fromRect.cy + (toRect.cy - fromRect.cy) * progress) - scrollable.scrollTop; var overEl = fromEl.ownerDocument.elementFromPoint(x, y); simulateEvent(overEl, 'mousemove', { @@ -100,13 +96,12 @@ clientY: y }); - if (progress < 1) { - requestAnimationFrame(loop); - } else { + if (progress >= 1) { options.ondragend && options.ondragend(); simulateEvent(toEl, 'mouseup'); + clearInterval(dragInterval); } - }); + }, 100); return { target: fromEl, |