Merge branch 'master' into alyssa-starter

1 files changed, 14 insertions, 1 deletions

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 059f88e96..5f2a592ae 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -42,7 +42,7 @@ export class FInfo {
     readOnly: boolean = false;
     fieldType?: FInfoFieldType;
     values?: FieldType[];
-
+    onLayout?: boolean;
     filterable?: boolean = true; // can be used as a Filter in FilterPanel
     // format?: string; // format to display values (e.g, decimal places, $, etc)
     // parse?: ScriptField; // parse a value from a string
@@ -176,6 +176,8 @@ export class DocumentOptions {
     map_pitch?: NUMt = new NumInfo('pitch of a map view', false);
     map_bearing?: NUMt = new NumInfo('bearing of a map view', false);
     map_style?: STRt = new StrInfo('mapbox style for a map view', false);
+    identifier?: STRt = new StrInfo('documentIcon displayed for each doc as "d[x]"', false);
+    _rotation?: NUMt = new NumInfo('Amount of rotation on a document in degrees', false);
 
     date_range?: STRt = new StrInfo('date range for calendar', false);
 
@@ -225,12 +227,23 @@ export class DocumentOptions {
     _header_pointerEvents?: PEVt = new PEInfo('types of events the header of a custom text document can consume');
     _lockedPosition?: BOOLt = new BoolInfo("lock the x,y coordinates of the document so that it can't be dragged");
     _lockedTransform?: BOOLt = new BoolInfo('lock the freeform_panx,freeform_pany and scale parameters of the document so that it be panned/zoomed');
+    _childrenSharedWithSchema?: BOOLt = new BoolInfo("whether this document's children are displayed in its parent schema view", false);
+    _lockedSchemaEditing?: BOOLt = new BoolInfo('', false);
 
     dataViz_title?: string;
     dataViz_line?: string;
     dataViz_pie?: string;
     dataViz_histogram?: string;
     dataViz?: string;
+    dataViz_savedTemplates?: LISTt;
+
+    borderWidth?: STRt = new StrInfo('Width of user-added border', false);
+    borderColor?: STRt = new StrInfo('Color of user-added border', false);
+    text_fontColor?: STRt = new StrInfo('Color of text', false);
+    text_align?: STRt = new StrInfo('alignment');
+    hCentering?: 'h-left' | 'h-center' | 'h-right';
+    isDefaultTemplateDoc?: BOOLt = new BoolInfo('');
+    contentBold?: BOOLt = new BoolInfo('');
 
     layout?: string | Doc; // default layout string or template document
     layout_isSvg?: BOOLt = new BoolInfo('whether document decorations and other selections should handle pointerEvents for svg content or use doc bounding box');