From 84eea14a86265ce0585342d9f3a3c4107c02df17 Mon Sep 17 00:00:00 2001 From: Tyler Schicke Date: Wed, 6 Feb 2019 01:43:09 -0500 Subject: Simplified function names in Document class --- src/views/nodes/CollectionFreeFormDocumentView.tsx | 20 +++++++-------- src/views/nodes/DocumentView.tsx | 30 +++++++++++----------- src/views/nodes/FieldView.tsx | 2 +- src/views/nodes/FormattedTextBox.tsx | 8 +++--- src/views/nodes/ImageBox.tsx | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src/views/nodes') diff --git a/src/views/nodes/CollectionFreeFormDocumentView.tsx b/src/views/nodes/CollectionFreeFormDocumentView.tsx index ebe6d411c..23863ce18 100644 --- a/src/views/nodes/CollectionFreeFormDocumentView.tsx +++ b/src/views/nodes/CollectionFreeFormDocumentView.tsx @@ -30,20 +30,20 @@ export class CollectionFreeFormDocumentView extends DocumentView { @computed get x(): number { - return this.props.Document.GetFieldValue(KeyStore.X, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.X, NumberField, Number(0)); } @computed get y(): number { - return this.props.Document.GetFieldValue(KeyStore.Y, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.Y, NumberField, Number(0)); } set x(x: number) { - this.props.Document.SetFieldValue(KeyStore.X, x, NumberField) + this.props.Document.SetData(KeyStore.X, x, NumberField) } set y(y: number) { - this.props.Document.SetFieldValue(KeyStore.Y, y, NumberField) + this.props.Document.SetData(KeyStore.Y, y, NumberField) } @computed @@ -53,29 +53,29 @@ export class CollectionFreeFormDocumentView extends DocumentView { @computed get width(): number { - return this.props.Document.GetFieldValue(KeyStore.Width, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.Width, NumberField, Number(0)); } set width(w: number) { - this.props.Document.SetFieldValue(KeyStore.Width, w, NumberField) + this.props.Document.SetData(KeyStore.Width, w, NumberField) } @computed get height(): number { - return this.props.Document.GetFieldValue(KeyStore.Height, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.Height, NumberField, Number(0)); } set height(h: number) { - this.props.Document.SetFieldValue(KeyStore.Height, h, NumberField) + this.props.Document.SetData(KeyStore.Height, h, NumberField) } @computed get zIndex(): number { - return this.props.Document.GetFieldValue(KeyStore.ZIndex, NumberField, Number(0)); + return this.props.Document.GetData(KeyStore.ZIndex, NumberField, Number(0)); } set zIndex(h: number) { - this.props.Document.SetFieldValue(KeyStore.ZIndex, h, NumberField) + this.props.Document.SetData(KeyStore.ZIndex, h, NumberField) } @action diff --git a/src/views/nodes/DocumentView.tsx b/src/views/nodes/DocumentView.tsx index a1262e2ba..5be17fe54 100644 --- a/src/views/nodes/DocumentView.tsx +++ b/src/views/nodes/DocumentView.tsx @@ -31,17 +31,17 @@ export class DocumentView extends React.Component { } @computed get layout(): string { - return this.props.Document.GetFieldValue(KeyStore.Layout, TextField, String("

Error loading layout data

")); + return this.props.Document.GetData(KeyStore.Layout, TextField, String("

Error loading layout data

")); } @computed get layoutKeys(): Key[] { - return this.props.Document.GetFieldValue(KeyStore.LayoutKeys, ListField, new Array()); + return this.props.Document.GetData(KeyStore.LayoutKeys, ListField, new Array()); } @computed get layoutFields(): Key[] { - return this.props.Document.GetFieldValue(KeyStore.LayoutFields, ListField, new Array()); + return this.props.Document.GetData(KeyStore.LayoutFields, ListField, new Array()); } // @@ -50,7 +50,7 @@ export class DocumentView extends React.Component { @computed public get ScalingToScreenSpace(): number { if (this.props.ContainingCollectionView != undefined && this.props.ContainingCollectionView.props.ContainingDocumentView != undefined) { - let ss = this.props.ContainingCollectionView.props.DocumentForCollection.GetFieldValue(KeyStore.Scale, NumberField, Number(1)); + let ss = this.props.ContainingCollectionView.props.DocumentForCollection.GetData(KeyStore.Scale, NumberField, Number(1)); return this.props.ContainingCollectionView.props.ContainingDocumentView.ScalingToScreenSpace * ss; } return 1; @@ -68,8 +68,8 @@ export class DocumentView extends React.Component { let ContainerX: number = parentX - COLLECTION_BORDER_WIDTH; let ContainerY: number = parentY - COLLECTION_BORDER_WIDTH; - var Xx = this.props.Document.GetFieldValue(KeyStore.X, NumberField, Number(0)); - var Yy = this.props.Document.GetFieldValue(KeyStore.Y, NumberField, Number(0)); + var Xx = this.props.Document.GetData(KeyStore.X, NumberField, Number(0)); + var Yy = this.props.Document.GetData(KeyStore.Y, NumberField, Number(0)); // CollectionDockingViews change the location of their children frames without using a Dash transformation. // They also ignore any transformation that may have been applied to their content document. // NOTE: this currently assumes CollectionDockingViews aren't nested. @@ -79,9 +79,9 @@ export class DocumentView extends React.Component { Yy = ry - COLLECTION_BORDER_WIDTH; } - let Ss = this.props.Document.GetFieldValue(KeyStore.Scale, NumberField, Number(1)); - let Panxx = this.props.Document.GetFieldValue(KeyStore.PanX, NumberField, Number(0)); - let Panyy = this.props.Document.GetFieldValue(KeyStore.PanY, NumberField, Number(0)); + let Ss = this.props.Document.GetData(KeyStore.Scale, NumberField, Number(1)); + let Panxx = this.props.Document.GetData(KeyStore.PanX, NumberField, Number(0)); + let Panyy = this.props.Document.GetData(KeyStore.PanY, NumberField, Number(0)); let LocalX = (ContainerX - (Xx + Panxx)) / Ss; let LocalY = (ContainerY - (Yy + Panyy)) / Ss; @@ -93,8 +93,8 @@ export class DocumentView extends React.Component { // public TransformToScreenPoint(localX: number, localY: number, Ss: number = 1, Panxx: number = 0, Panyy: number = 0): { ScreenX: number, ScreenY: number } { - var Xx = this.props.Document.GetFieldValue(KeyStore.X, NumberField, Number(0)); - var Yy = this.props.Document.GetFieldValue(KeyStore.Y, NumberField, Number(0)); + var Xx = this.props.Document.GetData(KeyStore.X, NumberField, Number(0)); + var Yy = this.props.Document.GetData(KeyStore.Y, NumberField, Number(0)); // CollectionDockingViews change the location of their children frames without using a Dash transformation. // They also ignore any transformation that may have been applied to their content document. // NOTE: this currently assumes CollectionDockingViews aren't nested. @@ -113,9 +113,9 @@ export class DocumentView extends React.Component { // first transform the local point into the parent collection's coordinate space. let containingDocView = this.props.ContainingCollectionView != undefined ? this.props.ContainingCollectionView.props.ContainingDocumentView : undefined; if (containingDocView != undefined) { - let ss = containingDocView.props.Document.GetFieldValue(KeyStore.Scale, NumberField, Number(1)); - let panxx = containingDocView.props.Document.GetFieldValue(KeyStore.PanX, NumberField, Number(0)) + COLLECTION_BORDER_WIDTH * ss; - let panyy = containingDocView.props.Document.GetFieldValue(KeyStore.PanY, NumberField, Number(0)) + COLLECTION_BORDER_WIDTH * ss; + let ss = containingDocView.props.Document.GetData(KeyStore.Scale, NumberField, Number(1)); + let panxx = containingDocView.props.Document.GetData(KeyStore.PanX, NumberField, Number(0)) + COLLECTION_BORDER_WIDTH * ss; + let panyy = containingDocView.props.Document.GetData(KeyStore.PanY, NumberField, Number(0)) + COLLECTION_BORDER_WIDTH * ss; let { ScreenX, ScreenY } = containingDocView.TransformToScreenPoint(parentX, parentY, ss, panxx, panyy); parentX = ScreenX; parentY = ScreenY; @@ -133,7 +133,7 @@ export class DocumentView extends React.Component { if (bindings.DocumentView === undefined) bindings.DocumentView = this; for (const key of this.layoutFields) { - let field = doc.GetField(key); + let field = doc.Get(key); if (field) { bindings[key.Name] = field.GetValue(); } diff --git a/src/views/nodes/FieldView.tsx b/src/views/nodes/FieldView.tsx index 2a2355a23..71e24986a 100644 --- a/src/views/nodes/FieldView.tsx +++ b/src/views/nodes/FieldView.tsx @@ -29,7 +29,7 @@ export class FieldView extends React.Component { @computed get field(): Opt { const { doc, fieldKey } = this.props; - return doc.GetField(fieldKey); + return doc.Get(fieldKey); } render() { const field = this.field; diff --git a/src/views/nodes/FormattedTextBox.tsx b/src/views/nodes/FormattedTextBox.tsx index 9c4b24226..e00ab6701 100644 --- a/src/views/nodes/FormattedTextBox.tsx +++ b/src/views/nodes/FormattedTextBox.tsx @@ -50,7 +50,7 @@ export class FormattedTextBox extends React.Component { const state = this._editorView.state.apply(tx); this._editorView.updateState(state); const { doc, fieldKey } = this.props; - doc.SetFieldValue(fieldKey, JSON.stringify(state.toJSON()), RichTextField); + doc.SetData(fieldKey, JSON.stringify(state.toJSON()), RichTextField); } } @@ -66,7 +66,7 @@ export class FormattedTextBox extends React.Component { ] }; - let field = doc.GetFieldT(fieldKey, RichTextField); + let field = doc.GetT(fieldKey, RichTextField); if (field) { state = EditorState.fromJSON(config, JSON.parse(field.Data)); } else { @@ -80,7 +80,7 @@ export class FormattedTextBox extends React.Component { } this._reactionDisposer = reaction(() => { - const field = this.props.doc.GetFieldT(this.props.fieldKey, RichTextField); + const field = this.props.doc.GetT(this.props.fieldKey, RichTextField); return field ? field.Data : undefined; }, (field) => { if (field && this._editorView) { @@ -105,7 +105,7 @@ export class FormattedTextBox extends React.Component { @action onChange(e: React.ChangeEvent) { const { fieldKey, doc } = this.props; - doc.SetFieldValue(fieldKey, e.target.value, RichTextField); + doc.SetData(fieldKey, e.target.value, RichTextField); } onPointerDown = (e: React.PointerEvent): void => { let me = this; diff --git a/src/views/nodes/ImageBox.tsx b/src/views/nodes/ImageBox.tsx index dd201f20f..eceb04b07 100644 --- a/src/views/nodes/ImageBox.tsx +++ b/src/views/nodes/ImageBox.tsx @@ -59,7 +59,7 @@ export class ImageBox extends React.Component { } render() { - let field = this.props.doc.GetFieldT(this.props.fieldKey, ImageField); + let field = this.props.doc.GetT(this.props.fieldKey, ImageField); let path = ""; if (field) { path = field.Data.href; -- cgit v1.2.3-70-g09d2