diff options
| author | bob <bcz@cs.brown.edu> | 2019-09-13 09:18:12 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-09-13 09:18:12 -0400 |
| commit | 32861c7cfcac8c03be5692fb98b5a7dc7786be83 (patch) | |
| tree | 3cb09464277cc020fc1ab772381cc4cbd828b091 /src/client/views/InkingControl.tsx | |
| parent | b3d9c4e3d8c7c425df41b2d8555a7d242771a823 (diff) | |
| parent | e241e61d6521ff5d63de1292f2b4269493f5d7cc (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src/client/views/InkingControl.tsx')
| -rw-r--r-- | src/client/views/InkingControl.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/InkingControl.tsx b/src/client/views/InkingControl.tsx index aa573f16b..867735c0b 100644 --- a/src/client/views/InkingControl.tsx +++ b/src/client/views/InkingControl.tsx @@ -73,7 +73,7 @@ export class InkingControl extends React.Component { let cv = view.props.ContainingCollectionView; let ruleProvider = cv && (Cast(cv.props.Document.ruleProvider, Doc) as Doc); let parback = cv && StrCast(cv.props.Document.backgroundColor); - cv && parback && ((ruleProvider ? ruleProvider : cv.props.Document)["ruleColor_" + NumCast(view.props.Document.heading)] = Utils.toRGBAstr(color.rgb)); + cv && parback && (Doc.GetProto(ruleProvider ? ruleProvider : cv.props.Document)["ruleColor_" + NumCast(view.props.Document.heading)] = Utils.toRGBAstr(color.rgb)); // if (parback && cv && parback.indexOf("rgb") !== -1) { // let parcol = Utils.fromRGBAstr(parback); // let hsl = Utils.RGBToHSL(parcol.r, parcol.g, parcol.b); |