diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-03 12:29:23 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-03 12:29:23 +0000 |
commit | bc696947fdf0423595cbbcf83b6dc94fb2d2290c (patch) | |
tree | 315effdcebc3655c2e22751872a8697090db9bf7 | |
parent | e036cb04a29e733388d961dc109d014c3416f105 (diff) | |
parent | 7c61fb036e768dd8ed622f3022560d4f851014ff (diff) | |
download | gitlab-ce-bc696947fdf0423595cbbcf83b6dc94fb2d2290c.tar.gz |
Merge branch '59942-fix-mr-swipe-diff-user-select' into 'master'
MR image diff swipe view: Disable user-select on drag
Closes #59942
See merge request gitlab-org/gitlab-ce!26884
2 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue index f085ef35ccc..b25aebd7c98 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue @@ -102,7 +102,7 @@ export default { :style="{ width: onionMaxPixelWidth, height: onionMaxPixelHeight, - 'user-select': dragging === true ? 'none' : '', + 'user-select': dragging ? 'none' : null, }" class="onion-skin-frame" > diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue index 1c970b72a66..eddafc759a2 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue @@ -68,12 +68,10 @@ export default { }, startDrag() { this.dragging = true; - document.body.style.userSelect = 'none'; document.body.addEventListener('mousemove', this.dragMove); }, stopDrag() { this.dragging = false; - document.body.style.userSelect = ''; document.body.removeEventListener('mousemove', this.dragMove); }, prepareSwipe() { @@ -104,7 +102,13 @@ export default { <template> <div class="swipe view"> - <div ref="swipeFrame" class="swipe-frame"> + <div + ref="swipeFrame" + :style="{ + 'user-select': dragging ? 'none' : null, + }" + class="swipe-frame" + > <image-viewer key="swipeOldImg" ref="swipeOldImg" |