TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-25 09:03:12 +03:00
Code Issues Projects Releases Wiki Activity

Fixed right-click triggering drag in {{movable}} modifier

Browse Source 
no issue

- if the right button was pressed on the movable element it would start "drag" but also show the right-click menu meaning that once you clicked to close the menu the movable element was stuck to your pointer without the left button being held down
This commit is contained in:
Kevin Ansfield 2021-11-04 09:49:14 +00:00
parent 9568f703c3
commit 49ea27cfb8
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ghost/admin/app/modifiers/movable.js
View File

@ -49,21 +49,22 @@ export default class MovableModifier extends Modifier {
@action
dragStart(e) {
if (e.type === 'touchstart') {
this.initialX = e.touches[0].clientX - this.xOffset;
this.initialY = e.touches[0].clientY - this.yOffset;
} else {
this.initialX = e.clientX - this.xOffset;
this.initialY = e.clientY - this.yOffset;
}
if (e.type === 'touchstart' || e.button === 0) {
if (e.type === 'touchstart') {
this.initialX = e.touches[0].clientX - this.xOffset;
this.initialY = e.touches[0].clientY - this.yOffset;
} else {
this.initialX = e.clientX - this.xOffset;
this.initialY = e.clientY - this.yOffset;
}
for (const elem of (e.path || e.composedPath())) {
if (elem === this.element) {
e.preventDefault();
e.stopPropagation();
this.disablePointerEvents();
this.addActiveEventListeners();
break;
for (const elem of (e.path || e.composedPath())) {
if (elem === this.element) {
this.disableScroll();
this.disablePointerEvents();
this.addActiveEventListeners();
break;
}
}
}
}
@ -71,7 +72,7 @@ export default class MovableModifier extends Modifier {
@action
dragEnd(e) {
e.preventDefault();
this.enableScroll();
this.enablePointerEvents();
this.initialX = this.currentX;
this.initialY = this.currentY;
@ -100,16 +101,22 @@ export default class MovableModifier extends Modifier {
this.element.style.transform = `translate3d(${xPos}px, ${yPos}px, 0)`;
}
// TODO: pointer events are not disabled because dragging to an area off
// central editor canvas exits edit mode - investigate further
disablePointerEvents() {
// this.element.style.pointerEvents = 'none';
disableScroll() {
this.originalOverflow = this.element.style.overflow;
this.element.style.overflow = 'hidden';
}
enablePointerEvents() {
// this.element.style.pointerEvents = '';
enableScroll() {
this.element.style.overflow = this.originalOverflow;
}
// TODO: pointer events are not disabled because dragging to an area off
// central editor canvas exits edit mode - investigate further
disablePointerEvents() {
// this.element.style.pointerEvents = 'none';
}
enablePointerEvents() {
// this.element.style.pointerEvents = '';
}
}