diff options
| author | bobzel <zzzman@gmail.com> | 2019-02-27 00:01:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 00:01:11 -0500 |
| commit | 609dc8f234f6eafdd5c7ed3f7040fff169bf266a (patch) | |
| tree | 133da1d566c0fb37e14c84494aa14edef7ed6bd8 /src/client/views/nodes/FieldView.tsx | |
| parent | 04ee2ad6e7ca887c3cfc7277c4b382f936c0fa6d (diff) | |
| parent | 14d6495e4d4b9d38a37187a50ebeb84057abbc20 (diff) | |
Merge pull request #7 from browngraphicslab/web_box
Web box
Diffstat (limited to 'src/client/views/nodes/FieldView.tsx')
| -rw-r--r-- | src/client/views/nodes/FieldView.tsx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/client/views/nodes/FieldView.tsx b/src/client/views/nodes/FieldView.tsx index b71309bf5..a883fa672 100644 --- a/src/client/views/nodes/FieldView.tsx +++ b/src/client/views/nodes/FieldView.tsx @@ -7,11 +7,12 @@ import { TextField } from "../../../fields/TextField"; import { NumberField } from "../../../fields/NumberField"; import { RichTextField } from "../../../fields/RichTextField"; import { ImageField } from "../../../fields/ImageField"; +import { WebField } from "../../../fields/WebField"; import { Key } from "../../../fields/Key"; import { FormattedTextBox } from "./FormattedTextBox"; import { ImageBox } from "./ImageBox"; +import { WebBox } from "./WebBox"; import { HtmlField } from "../../../fields/HtmlField"; -import { WebView } from "./WebView"; // // these properties get assigned through the render() method of the DocumentView when it creates this node. @@ -50,12 +51,16 @@ export class FieldView extends React.Component<FieldViewProps> { else if (field instanceof ImageField) { return <ImageBox {...this.props} /> } + else if (field instanceof WebField) { + return <WebBox {...this.props} /> + } + // bcz: this belongs here, but it doesn't render well so taking it out for now + // else if (field instanceof HtmlField) { + // return <WebBox {...this.props} /> + // } else if (field instanceof NumberField) { return <p>{field.Data}</p> } - else if (field instanceof HtmlField) { - return <WebView {...this.props} /> - } else if (field != FieldWaiting) { return <p>{JSON.stringify(field.GetValue())}</p> } |
