diff options
| author | Sam Wilkins <samwilkins333@gmail.com> | 2019-08-14 22:03:20 -0400 |
|---|---|---|
| committer | Sam Wilkins <samwilkins333@gmail.com> | 2019-08-14 22:03:20 -0400 |
| commit | 750a3333392724d10675ac4e2a6e124dc248bbe0 (patch) | |
| tree | 93928b05d3ec9de155e7c07d989093009c6f2ed5 /src/client/util/DragManager.ts | |
| parent | 244952ccc52bf66ac34eeea7d5469d0ba6313aff (diff) | |
| parent | 71f27b718d9be29034ba233b5be18ea29f59f30b (diff) | |
resolved merge conflicts
Diffstat (limited to 'src/client/util/DragManager.ts')
| -rw-r--r-- | src/client/util/DragManager.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts index a7aaaed7c..0b6d9b5e5 100644 --- a/src/client/util/DragManager.ts +++ b/src/client/util/DragManager.ts @@ -490,7 +490,7 @@ export namespace DragManager { x: e.x, y: e.y, data: dragData, - mods: e.altKey ? "AltKey" : e.ctrlKey ? "CtrlKey" : "" + mods: e.altKey ? "AltKey" : e.ctrlKey ? "CtrlKey" : e.metaKey ? "MetaKey" : "" } }) ); |