diff options
| author | bob <bcz@cs.brown.edu> | 2019-06-25 09:09:28 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-06-25 09:09:28 -0400 |
| commit | 66acf0237f2e1fe74660e5c2a035757403f79f8b (patch) | |
| tree | a4fa797203ee262072c53ba845e6bcce214f151e /src/client/util/DragManager.ts | |
| parent | 038819c6f1490bfa3ef9a5a7404ea8688f2b9fd6 (diff) | |
| parent | 45dee8324dc360953c584ba18f5b53220ecfdf61 (diff) | |
Merge branch 'templatesMac' of https://github.com/browngraphicslab/Dash-Web into templatesMac
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 cc83b7346..3143924fc 100644 --- a/src/client/util/DragManager.ts +++ b/src/client/util/DragManager.ts @@ -92,6 +92,8 @@ export namespace DragManager { handlers: DragHandlers; hideSource: boolean | (() => boolean); + + withoutShiftDrag?: boolean; } export interface DragDropDisposer { @@ -318,7 +320,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({ pageX: e.pageX, |