Merge branch 'master' into UI_Update_Eric_Ma

1 files changed, 9 insertions, 9 deletions

diff --git a/src/client/views/DashboardView.tsx b/src/client/views/DashboardView.tsx
index dee161931..02c5085a2 100644
--- a/src/client/views/DashboardView.tsx
+++ b/src/client/views/DashboardView.tsx
@@ -358,15 +358,15 @@ export class DashboardView extends React.Component {
             y: 400,
             _width: 1500,
             _height: 1000,
-            _fitWidth: true,
-            _backgroundGridShow: true,
+            _layout_fitWidth: true,
+            _freeform_backgroundGrid: true,
             backgroundColor: background,
             title: `Untitled Tab 1`,
         };
         const title = name ? name : `Dashboard ${dashboardCount}`;
         const freeformDoc = Doc.GuestTarget || Docs.Create.FreeformDocument([], freeformOptions);
         const dashboardDoc = Docs.Create.StandardCollectionDockingDocument([{ doc: freeformDoc, initialWidth: 600 }], { title: title }, id, 'row');
-        freeformDoc.context = dashboardDoc;
+        freeformDoc.embedContainer = dashboardDoc;
 
         // switching the tabs from the datadoc to the regular doc
         const dashboardTabs = DocListCast(dashboardDoc[DataSym].data);
@@ -396,7 +396,7 @@ export class DashboardView extends React.Component {
             btnType: ButtonType.ClickButton,
             buttonText: 'New trail',
             icon: 'plus',
-            system: true,
+            isSystem: true,
         };
         const reqdBtnScript = { onClick: `createNewPresentation()` };
         const myTrailsBtn = DocUtils.AssignScripts(Docs.Create.FontIconDocument(reqdBtnOpts), reqdBtnScript);
@@ -406,13 +406,13 @@ export class DashboardView extends React.Component {
         // but we don't want to create the list of trails here-- but rather in createDashboard
         const reqdOpts: DocumentOptions = {
             title: 'My Trails',
-            _showTitle: 'title',
+            _layout_showTitle: 'title',
             _height: 100,
             treeViewHideTitle: true,
-            _fitWidth: true,
+            _layout_fitWidth: true,
             _gridGap: 5,
             _forceActive: true,
-            childDropAction: 'alias',
+            childDropAction: 'embed',
             treeViewTruncateTitleWidth: 150,
             ignoreClick: true,
             buttonMenu: true,
@@ -423,7 +423,7 @@ export class DashboardView extends React.Component {
             boxShadow: '0 0',
             childDontRegisterViews: true,
             targetDropAction: 'same',
-            system: true,
+            isSystem: true,
             explainer: 'All of the trails that you have created will appear here.',
         };
         const myTrails = DocUtils.AssignScripts(Docs.Create.TreeDocument([], reqdOpts), { treeViewChildDoubleClick: 'openPresentation(documentView.rootDoc)' });
@@ -453,7 +453,7 @@ ScriptingGlobals.add(function resetDashboard(dashboard: Doc) {
     DashboardView.resetDashboard(dashboard);
 }, 'move all dashboard tabs to single stack');
 ScriptingGlobals.add(function addToDashboards(dashboard: Doc) {
-    DashboardView.openDashboard(Doc.MakeAlias(dashboard));
+    DashboardView.openDashboard(Doc.MakeEmbedding(dashboard));
 }, 'adds Dashboard to set of Dashboards');
 ScriptingGlobals.add(function snapshotDashboard() {
     DashboardView.snapshotDashboard();