aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/InkingStroke.tsx
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/views/InkingStroke.tsx')
-rw-r--r--src/client/views/InkingStroke.tsx18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/client/views/InkingStroke.tsx b/src/client/views/InkingStroke.tsx
index b8d428d31..332c22512 100644
--- a/src/client/views/InkingStroke.tsx
+++ b/src/client/views/InkingStroke.tsx
@@ -1,9 +1,10 @@
import { observer } from "mobx-react";
-import { observable, trace } from "mobx";
+import { observable, trace, runInAction } from "mobx";
import { InkingControl } from "./InkingControl";
import React = require("react");
import { InkTool } from "../../new_fields/InkField";
import "./InkingStroke.scss";
+import { AudioBox } from "./nodes/AudioBox";
interface StrokeProps {
@@ -15,6 +16,7 @@ interface StrokeProps {
color: string;
width: string;
tool: InkTool;
+ creationTime: number;
deleteCallback: (index: string) => void;
}
@@ -31,6 +33,11 @@ export class InkingStroke extends React.Component<StrokeProps> {
e.stopPropagation();
e.preventDefault();
}
+ if (InkingControl.Instance.selectedTool === InkTool.Scrubber && e.buttons === 1) {
+ AudioBox.SetScrubTime(this.props.creationTime);
+ e.stopPropagation();
+ e.preventDefault();
+ }
}
parseData = (line: Array<{ x: number, y: number }>): string => {
@@ -55,10 +62,9 @@ export class InkingStroke extends React.Component<StrokeProps> {
let pathlength = this.props.count; // bcz: this is needed to force reactions to the line's data changes
let marker = this.props.tool === InkTool.Highlighter ? "-marker" : "";
- let pointerEvents: any = InkingControl.Instance.selectedTool === InkTool.Eraser ? "all" : "none";
- return (
- <path className={`inkingStroke${marker}`} d={pathData} style={{ ...pathStyle, pointerEvents: pointerEvents }} strokeLinejoin="round" strokeLinecap="round"
- onPointerOver={this.deleteStroke} onPointerDown={this.deleteStroke} />
- );
+ let pointerEvents: any = InkingControl.Instance.selectedTool === InkTool.Eraser ||
+ InkingControl.Instance.selectedTool === InkTool.Scrubber ? "all" : "none";
+ return (<path className={`inkingStroke${marker}`} d={pathData} style={{ ...pathStyle, pointerEvents: pointerEvents }}
+ strokeLinejoin="round" strokeLinecap="round" onPointerOver={this.deleteStroke} onPointerDown={this.deleteStroke} />);
}
} \ No newline at end of file