mirror of
https://github.com/zen-browser/desktop.git
synced 2026-08-01 04:38:55 +00:00
gh-14724: Fix non-tab drags switching workspaces (gh-14731)
This commit is contained in:
@@ -726,10 +726,11 @@
|
||||
|
||||
#handle_sidebarDragOver(event) {
|
||||
const dt = event.dataTransfer;
|
||||
const isTabDrag = dt.mozTypesAt(0)[0] === TAB_DROP_TYPE;
|
||||
|
||||
const { isNearLeftEdge, isNearRightEdge } =
|
||||
this.#shouldSwitchSpace(event);
|
||||
if (isNearLeftEdge || isNearRightEdge) {
|
||||
if (isTabDrag && (isNearLeftEdge || isNearRightEdge)) {
|
||||
if (!this.#changeSpaceTimer && !this.#isOutOfWindow) {
|
||||
this.#changeSpaceTimer = setTimeout(() => {
|
||||
this.clearDragOverVisuals();
|
||||
@@ -753,6 +754,10 @@
|
||||
|
||||
handle_spaceIconDragOver(event) {
|
||||
const dt = event.dataTransfer;
|
||||
if (dt.mozTypesAt(0)[0] !== TAB_DROP_TYPE) {
|
||||
return;
|
||||
}
|
||||
|
||||
const draggedTab = dt.mozGetDataAt(TAB_DROP_TYPE, 0);
|
||||
if (draggedTab.hasAttribute("zen-essential")) {
|
||||
return;
|
||||
|
||||
@@ -198,9 +198,7 @@ class nsZenWorkspaceCreation extends MozXULElement {
|
||||
|
||||
this.currentProfile = {
|
||||
id: 0,
|
||||
name: lazy.l10n.formatValueSync(
|
||||
"zen-workspace-default-profile"
|
||||
),
|
||||
name: lazy.l10n.formatValueSync("zen-workspace-default-profile"),
|
||||
};
|
||||
} else {
|
||||
this.inputProfile.parentNode.hidden = true;
|
||||
@@ -311,9 +309,7 @@ class nsZenWorkspaceCreation extends MozXULElement {
|
||||
showManageContainers: false,
|
||||
});
|
||||
|
||||
const defaultItem = event.target.querySelector(
|
||||
'[data-usercontextid="0"]'
|
||||
);
|
||||
const defaultItem = event.target.querySelector('[data-usercontextid="0"]');
|
||||
if (defaultItem) {
|
||||
defaultItem.removeAttribute("data-l10n-id");
|
||||
defaultItem.label = lazy.l10n.formatValueSync(
|
||||
|
||||
@@ -1273,9 +1273,7 @@ class nsZenWorkspaces {
|
||||
showDefaultTab: true,
|
||||
});
|
||||
|
||||
const defaultItem = event.target.querySelector(
|
||||
'[data-usercontextid="0"]'
|
||||
);
|
||||
const defaultItem = event.target.querySelector('[data-usercontextid="0"]');
|
||||
if (defaultItem) {
|
||||
defaultItem.removeAttribute("data-l10n-id");
|
||||
defaultItem.label = lazy.l10n.formatValueSync(
|
||||
|
||||
Reference in New Issue
Block a user