aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2020-01-17 10:33:05 -0500
committerbob <bcz@cs.brown.edu>2020-01-17 10:33:05 -0500
commit810f6b9b2737f3617910e498f577499fcbf3ffab (patch)
treec277d0dca22a4460c1efca4e8ae5ff81904c5ead
parent12f3a4a1bfce522c7e647317035ec0deda5c73d5 (diff)
moved multilcolumnview into collections directory
-rw-r--r--src/client/views/collections/CollectionMulticolumnView.scss (renamed from src/client/views/CollectionMulticolumnView.scss)0
-rw-r--r--src/client/views/collections/CollectionMulticolumnView.tsx (renamed from src/client/views/CollectionMulticolumnView.tsx)17
-rw-r--r--src/client/views/collections/CollectionView.tsx2
3 files changed, 9 insertions, 10 deletions
diff --git a/src/client/views/CollectionMulticolumnView.scss b/src/client/views/collections/CollectionMulticolumnView.scss
index 120603a0b..120603a0b 100644
--- a/src/client/views/CollectionMulticolumnView.scss
+++ b/src/client/views/collections/CollectionMulticolumnView.scss
diff --git a/src/client/views/CollectionMulticolumnView.tsx b/src/client/views/collections/CollectionMulticolumnView.tsx
index 99242e8be..19a7b1123 100644
--- a/src/client/views/CollectionMulticolumnView.tsx
+++ b/src/client/views/collections/CollectionMulticolumnView.tsx
@@ -1,13 +1,12 @@
import { observer } from 'mobx-react';
-import { makeInterface } from '../../new_fields/Schema';
-import { documentSchema } from '../../new_fields/documentSchemas';
-import { CollectionSubView } from './collections/CollectionSubView';
-import { DragManager } from '../util/DragManager';
+import { makeInterface } from '../../../new_fields/Schema';
+import { documentSchema } from '../../../new_fields/documentSchemas';
+import { CollectionSubView } from './CollectionSubView';
import * as React from "react";
-import { Doc } from '../../new_fields/Doc';
-import { NumCast, StrCast } from '../../new_fields/Types';
-import { ContentFittingDocumentView } from './nodes/ContentFittingDocumentView';
-import { Utils } from '../../Utils';
+import { Doc } from '../../../new_fields/Doc';
+import { NumCast, StrCast } from '../../../new_fields/Types';
+import { ContentFittingDocumentView } from './../nodes/ContentFittingDocumentView';
+import { Utils } from '../../../Utils';
import "./collectionMulticolumnView.scss";
import { computed } from 'mobx';
@@ -36,7 +35,7 @@ const resolvedUnits = ["*", "px"];
const resizerWidth = 2;
@observer
-export default class CollectionMulticolumnView extends CollectionSubView(MulticolumnDocument) {
+export class CollectionMulticolumnView extends CollectionSubView(MulticolumnDocument) {
@computed
private get resolvedLayoutInformation(): LayoutData {
const unresolved: Unresolved[] = [];
diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx
index ce3aab579..4bd456233 100644
--- a/src/client/views/collections/CollectionView.tsx
+++ b/src/client/views/collections/CollectionView.tsx
@@ -19,7 +19,6 @@ import { DocumentType } from '../../documents/DocumentTypes';
import { DocumentManager } from '../../util/DocumentManager';
import { ImageUtils } from '../../util/Import & Export/ImageUtils';
import { SelectionManager } from '../../util/SelectionManager';
-import CollectionMulticolumnView from '../CollectionMulticolumnView';
import { ContextMenu } from "../ContextMenu";
import { FieldView, FieldViewProps } from '../nodes/FieldView';
import { ScriptBox } from '../ScriptBox';
@@ -28,6 +27,7 @@ import { CollectionDockingView } from "./CollectionDockingView";
import { AddCustomFreeFormLayout } from './collectionFreeForm/CollectionFreeFormLayoutEngines';
import { CollectionFreeFormView } from './collectionFreeForm/CollectionFreeFormView';
import { CollectionLinearView } from './CollectionLinearView';
+import { CollectionMulticolumnView } from './CollectionMulticolumnView';
import { CollectionPivotView } from './CollectionPivotView';
import { CollectionSchemaView } from "./CollectionSchemaView";
import { CollectionStackingView } from './CollectionStackingView';