diff options
| author | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-06-10 10:55:20 -0500 |
|---|---|---|
| committer | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-06-10 10:55:20 -0500 |
| commit | d6e17e1fd23ac867e13d601a2dae61acbf0a7195 (patch) | |
| tree | b93a5a9bbb1a66691c1f889754e462ea45f362fb /src/client/views/webcam | |
| parent | 3e6e77119a0ace5bddd59b58338edd4fa866055c (diff) | |
| parent | c3bbedc622080c6087c862d6fb0c8b3438d51edc (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into script_documents
Diffstat (limited to 'src/client/views/webcam')
| -rw-r--r-- | src/client/views/webcam/DashWebRTCVideo.tsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/views/webcam/DashWebRTCVideo.tsx b/src/client/views/webcam/DashWebRTCVideo.tsx index 83de9cc15..647e1ce6f 100644 --- a/src/client/views/webcam/DashWebRTCVideo.tsx +++ b/src/client/views/webcam/DashWebRTCVideo.tsx @@ -11,6 +11,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { IconProp, library } from '@fortawesome/fontawesome-svg-core'; import { faSync, faPhoneSlash } from "@fortawesome/free-solid-svg-icons"; import { Doc } from "../../../fields/Doc"; +import { InkTool } from "../../../fields/InkField"; library.add(faSync); library.add(faPhoneSlash); @@ -72,7 +73,7 @@ export class DashWebRTCVideo extends React.Component<CollectionFreeFormDocumentV </div >; const frozen = !this.props.isSelected() || DocumentDecorations.Instance.Interacting; - const classname = "webBox-cont" + (this.props.isSelected() && !Doc.GetSelectedTool() && !DocumentDecorations.Instance.Interacting ? "-interactive" : ""); + const classname = "webBox-cont" + (this.props.isSelected() && Doc.GetSelectedTool() === InkTool.None && !DocumentDecorations.Instance.Interacting ? "-interactive" : ""); return ( <> |