Merge branch 'master' into alyssa-starter

1 files changed, 7 insertions, 3 deletions

diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index b6cb845a6..56d28ee5d 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -19,7 +19,7 @@ import { Docs } from '../documents/Documents';
 import { CalendarManager } from '../util/CalendarManager';
 import { CaptureManager } from '../util/CaptureManager';
 import { DocumentManager } from '../util/DocumentManager';
-import { DragManager } from '../util/DragManager';
+import { DragManager, dropActionType } from '../util/DragManager';
 import { GroupManager } from '../util/GroupManager';
 import { HistoryUtil } from '../util/History';
 import { Hypothesis } from '../util/HypothesisUtils';
@@ -288,6 +288,7 @@ export class MainView extends ObservableReactComponent<{}> {
                 fa.faFolderOpen,
                 fa.faFolderPlus,
                 fa.faFolderClosed,
+                fa.faBook,
                 fa.faMapPin,
                 fa.faMapMarker,
                 fa.faFingerprint,
@@ -397,6 +398,7 @@ export class MainView extends ObservableReactComponent<{}> {
                 fa.faPaintBrush,
                 fa.faTimes,
                 fa.faFlag,
+                fa.faScroll,
                 fa.faEye,
                 fa.faArrowsAlt,
                 fa.faQuoteLeft,
@@ -452,6 +454,7 @@ export class MainView extends ObservableReactComponent<{}> {
                 fa.faAngleDown,
                 fa.faPlayCircle,
                 fa.faClock,
+                fa.faRoute,
                 fa.faRocket,
                 fa.faExchangeAlt,
                 fa.faHashtag,
@@ -488,6 +491,7 @@ export class MainView extends ObservableReactComponent<{}> {
                 fa.faUpload,
                 fa.faBorderAll,
                 fa.faBraille,
+                fa.faPersonChalkboard,
                 fa.faChalkboard,
                 fa.faPencilAlt,
                 fa.faEyeSlash,
@@ -623,7 +627,7 @@ export class MainView extends ObservableReactComponent<{}> {
                     isContentActive={returnTrue} // headerBar is awlays contentActive which means its items are always documentActive
                     ScreenToLocalTransform={this.headerBarScreenXf}
                     childHideResizeHandles={true}
-                    childDragAction="move"
+                    childDragAction={dropActionType.move}
                     dontRegisterView={true}
                     hideResizeHandles={true}
                     PanelWidth={this.headerBarDocWidth}
@@ -905,7 +909,7 @@ export class MainView extends ObservableReactComponent<{}> {
                     Document={Doc.MyDockedBtns}
                     docViewPath={returnEmptyDocViewList}
                     fieldKey="data"
-                    dropAction="embed"
+                    dropAction={dropActionType.embed}
                     styleProvider={DefaultStyleProvider}
                     select={emptyFunction}
                     isAnyChildContentActive={returnFalse}