diff options
author | Fawn <fangrui_tong@brown.edu> | 2019-06-25 18:23:26 -0400 |
---|---|---|
committer | Fawn <fangrui_tong@brown.edu> | 2019-06-25 18:23:26 -0400 |
commit | 7abe170ce5bd0c415e23456eb2bed26e8fdee7aa (patch) | |
tree | cc7bdf2859274b78fb8a803f746ec873b5c14a58 /src/client/util/DragManager.ts | |
parent | 41cf1e8536964764f18ab752140e484e36cbe464 (diff) | |
parent | 219cabb3fe42ab199550efc3423b7aaed4e1ee93 (diff) |
merge
Diffstat (limited to 'src/client/util/DragManager.ts')
-rw-r--r-- | src/client/util/DragManager.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts index 1aacf2c53..4be3d82d3 100644 --- a/src/client/util/DragManager.ts +++ b/src/client/util/DragManager.ts @@ -125,6 +125,8 @@ export namespace DragManager { handlers: DragHandlers; hideSource: boolean | (() => boolean); + + withoutShiftDrag?: boolean; } export interface DragDropDisposer { @@ -385,7 +387,7 @@ export namespace DragManager { if (dragData instanceof DocumentDragData) { dragData.userDropAction = e.ctrlKey || e.altKey ? "alias" : undefined; } - if (e.shiftKey && CollectionDockingView.Instance) { + if (((options && !options.withoutShiftDrag) || !options) && e.shiftKey && CollectionDockingView.Instance) { AbortDrag(); CollectionDockingView.Instance.StartOtherDrag(docs, { pageX: e.pageX, |