diff options
| author | tschicke-brown <tyler_schicke@brown.edu> | 2019-01-17 22:57:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-17 22:57:44 -0500 |
| commit | 4f370fb92ab849e6dabd9a8b5a762fa6c8d75188 (patch) | |
| tree | 249bec9f12bec513ac649119f67cef04d1dfb14b /src/views/nodes | |
| parent | 96dcfc8db79c035ba355d7459907f48c1f62ec08 (diff) | |
| parent | dced23210ce1b7e005d239f2167cae363bfef52f (diff) | |
Merge branch 'master' into move_doc_get_out_the_way
Diffstat (limited to 'src/views/nodes')
| -rw-r--r-- | src/views/nodes/DocumentView.tsx | 6 | ||||
| -rw-r--r-- | src/views/nodes/NodeView.scss | 2 | ||||
| -rw-r--r-- | src/views/nodes/RichTextView.tsx | 0 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/views/nodes/DocumentView.tsx b/src/views/nodes/DocumentView.tsx index 1c9f850ed..f955a8c39 100644 --- a/src/views/nodes/DocumentView.tsx +++ b/src/views/nodes/DocumentView.tsx @@ -51,12 +51,6 @@ export class DocumentView extends React.Component<IProps> { return this.props.dvm.Doc.GetFieldValue(KeyStore.Height, NumberField, Number(0)); } - //Temp - @computed - get data(): string { - return this.props.dvm.Doc.GetFieldValue(KeyStore.Data, TextField, String("")); - } - @computed get layout(): string { return this.props.dvm.Doc.GetFieldValue(KeyStore.Layout, TextField, String("<p>Error loading layout data</p>")); diff --git a/src/views/nodes/NodeView.scss b/src/views/nodes/NodeView.scss index e8964399b..a68335f87 100644 --- a/src/views/nodes/NodeView.scss +++ b/src/views/nodes/NodeView.scss @@ -1,6 +1,6 @@ .node { position: absolute; - // background: #cdcdcd; + background: #cdcdcd; overflow: hidden; diff --git a/src/views/nodes/RichTextView.tsx b/src/views/nodes/RichTextView.tsx new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/views/nodes/RichTextView.tsx |