diff options
| author | ab <abdullah_ahmed@brown.edu> | 2019-02-18 18:27:01 -0500 |
|---|---|---|
| committer | ab <abdullah_ahmed@brown.edu> | 2019-02-18 18:27:01 -0500 |
| commit | c03e3fc75ef9ffb56cbfadb0c3164ead1fea4a40 (patch) | |
| tree | 12b378c7bfd819aa7b22662281790ae61698daa7 /src/client/views/collections/CollectionViewBase.tsx | |
| parent | 61aa3a0a34a647a7f414fbeb72345675a5154433 (diff) | |
| parent | 3f98d6ec6050e7faa15179871f0d9669c1188a78 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into decor
Diffstat (limited to 'src/client/views/collections/CollectionViewBase.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionViewBase.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionViewBase.tsx b/src/client/views/collections/CollectionViewBase.tsx index 7e2fcb39d..1cf07ce05 100644 --- a/src/client/views/collections/CollectionViewBase.tsx +++ b/src/client/views/collections/CollectionViewBase.tsx @@ -19,7 +19,7 @@ export interface CollectionViewProps { ContainingDocumentView: Opt<DocumentView>; GetTransform: () => Transform; BackgroundView: Opt<DocumentView>; - Scaling: number; + ParentScaling: number; } export const COLLECTION_BORDER_WIDTH = 2; @@ -28,7 +28,7 @@ export const COLLECTION_BORDER_WIDTH = 2; export class CollectionViewBase extends React.Component<CollectionViewProps> { public static LayoutString(collectionType: string, fieldKey: string = "DataKey") { - return `<${collectionType} Scaling={Scaling} DocumentForCollection={Document} CollectionFieldKey={${fieldKey}} ContainingDocumentView={DocumentView} BackgroundView={BackgroundView} />`; + return `<${collectionType} ParentScaling={ParentScaling} DocumentForCollection={Document} CollectionFieldKey={${fieldKey}} ContainingDocumentView={DocumentView} BackgroundView={BackgroundView} />`; } @computed public get active(): boolean { |