aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/InkingControl.tsx
diff options
context:
space:
mode:
authorMonika <monika_hedman@brown.edu>2019-07-01 15:39:37 -0400
committerMonika <monika_hedman@brown.edu>2019-07-01 15:39:37 -0400
commitc5391bf0d352f69211ba28fc263d27204d7b8dc4 (patch)
treeacbc632aff852e74015bd1c8eee4933a7565cb94 /src/client/views/InkingControl.tsx
parentee4155a168dadad182719eb55df3459d6a937a45 (diff)
parentcd78d5b3371d73cc51dcb6f3dbfdca1a3bbcf6e1 (diff)
edits made
Diffstat (limited to 'src/client/views/InkingControl.tsx')
-rw-r--r--src/client/views/InkingControl.tsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/views/InkingControl.tsx b/src/client/views/InkingControl.tsx
index 0837e07a9..ec228ce98 100644
--- a/src/client/views/InkingControl.tsx
+++ b/src/client/views/InkingControl.tsx
@@ -1,5 +1,5 @@
import { observable, action, computed } from "mobx";
-import { CirclePicker, ColorResult } from 'react-color';
+import { ColorResult } from 'react-color';
import React = require("react");
import { observer } from "mobx-react";
import "./InkingControl.scss";
@@ -17,7 +17,7 @@ export class InkingControl extends React.Component {
@observable private _selectedTool: InkTool = InkTool.None;
@observable private _selectedColor: string = "rgb(244, 67, 54)";
@observable private _selectedWidth: string = "25";
- @observable private _open: boolean = false;
+ @observable public _open: boolean = false;
constructor(props: Readonly<{}>) {
super(props);
@@ -39,7 +39,7 @@ export class InkingControl extends React.Component {
@action
switchColor = (color: ColorResult): void => {
this._selectedColor = color.hex + (color.rgb.a !== undefined ? this.decimalToHexString(Math.round(color.rgb.a * 255)) : "ff");
- SelectionManager.SelectedDocuments().forEach(doc => Doc.GetProto(doc.props.Document).backgroundColor = this._selectedColor);
+ if (InkingControl.Instance.selectedTool === InkTool.None) SelectionManager.SelectedDocuments().forEach(doc => (doc.props.Document.isTemplate ? doc.props.Document : Doc.GetProto(doc.props.Document)).backgroundColor = this._selectedColor);
}
@action