Revert "FIX: delay custom section reorder (#20781)" (#20786)

This reverts commit 4fe79ccc79.
This commit is contained in:
Joffrey JAFFEUX 2023-03-23 11:27:12 +01:00 committed by GitHub
parent 67913e59e0
commit 165a3217c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 31 deletions

View File

@ -13,7 +13,7 @@ export function setEnvironment(e) {
} }
export function isTesting() { export function isTesting() {
return environment === "testing" || environment === "test"; return environment === "testing";
} }
// Generally means "before we migrated to Ember CLI" // Generally means "before we migrated to Ember CLI"

View File

@ -1,7 +1,6 @@
import { tracked } from "@glimmer/tracking"; import { tracked } from "@glimmer/tracking";
import { bind } from "discourse-common/utils/decorators"; import { bind } from "discourse-common/utils/decorators";
import RouteInfoHelper from "discourse/lib/sidebar/route-info-helper"; import RouteInfoHelper from "discourse/lib/sidebar/route-info-helper";
import { isTesting } from "discourse-common/config/environment";
export default class SectionLink { export default class SectionLink {
@tracked linkDragCss; @tracked linkDragCss;
@ -23,25 +22,8 @@ export default class SectionLink {
} }
@bind @bind
didStartDrag(event) { didStartDrag(e) {
// 0 represents left button of the mouse this.mouseY = e.screenY;
if (event.button === 0) {
this.willDrag = true;
setTimeout(
() => {
this.delayedStart(event);
},
isTesting() ? 0 : 300
);
}
}
delayedStart(event) {
if (this.willDrag) {
this.mouseY = event.screenY;
this.linkDragCss = "drag";
this.section.disable();
this.drag = true;
}
} }
@bind @bind
@ -50,16 +32,11 @@ export default class SectionLink {
this.mouseY = null; this.mouseY = null;
this.section.enable(); this.section.enable();
this.section.reorder(); this.section.reorder();
this.willDrag = false;
this.drag = false;
} }
@bind @bind
dragMove(event) { dragMove(e) {
if (!this.drag) { const currentMouseY = e.screenY;
return;
}
const currentMouseY = event.screenY;
const distance = currentMouseY - this.mouseY; const distance = currentMouseY - this.mouseY;
if (!this.linkHeight) { if (!this.linkHeight) {
this.linkHeight = document.getElementsByClassName( this.linkHeight = document.getElementsByClassName(
@ -78,5 +55,7 @@ export default class SectionLink {
this.mouseY = currentMouseY; this.mouseY = currentMouseY;
} }
} }
this.linkDragCss = "drag";
this.section.disable();
} }
} }

View File

@ -16,9 +16,6 @@
} }
.sidebar-section-wrapper.disabled { .sidebar-section-wrapper.disabled {
a {
pointer-events: none;
}
.sidebar-section-link-wrapper { .sidebar-section-link-wrapper {
.sidebar-section-link-prefix.icon, .sidebar-section-link-prefix.icon,
.sidebar-section-link { .sidebar-section-link {