aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2020-01-15 17:17:37 -0500
committerbob <bcz@cs.brown.edu>2020-01-15 17:17:37 -0500
commit380215f0b934eba265a6b97ab2edc502fd71818a (patch)
tree8416e644e3a7e73269c70f5c2fdb505541bf5650 /src
parent8212288108c3acfd129e45b9f496f0606a8d2848 (diff)
parentc9a1e2dbff70bf7033aaef6d5f468f43ee726aae (diff)
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src')
-rw-r--r--src/client/views/CollectionMulticolumnView.tsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/views/CollectionMulticolumnView.tsx b/src/client/views/CollectionMulticolumnView.tsx
index 0aa615ffc..3231c0da1 100644
--- a/src/client/views/CollectionMulticolumnView.tsx
+++ b/src/client/views/CollectionMulticolumnView.tsx
@@ -47,14 +47,14 @@ export default class CollectionMulticolumnView extends CollectionSubView(Multico
<div className={"collectionMulticolumnView_outer"}>
<div className={"collectionMulticolumnView_contents"}>
{this.configuration.map(config => {
- const { target } = config;
+ const { target, columnWidth } = config;
if (target instanceof Doc) {
let computedWidth: number = 0;
- const widthSpecifier = Cast(config.columnWidth, "number");
+ const widthSpecifier = Cast(columnWidth, "number");
let matches: RegExpExecArray | null;
if (widthSpecifier !== undefined) {
computedWidth = widthSpecifier;
- } else if ((matches = /([\d.]+)\%/.exec(StrCast(config.columnWidth))) !== null) {
+ } else if ((matches = /([\d.]+)\%/.exec(StrCast(columnWidth))) !== null) {
computedWidth = Number(matches[1]) / 100 * PanelWidth();
}
return (!computedWidth ? (null) :