Merge pull request #151 from mytakedotorg/feature/video-slider-ui

Feature/video slider ui
mytakedotorg · Feb 16, 2018 · 53bef2e · 53bef2e
2 parents fe5f6f4 + 5f23ead
commit 53bef2e
Show file tree

Hide file tree

Showing 45 changed files with 4,168 additions and 590 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -26,6 +26,7 @@
     "binary-search": "^1.3.2",
     "keycode": "^2.1.9",
     "lodash": "^4.17.4",
+    "rc-slider": "^8.6.0",
     "react": "^15.6.2",
     "react-dom": "^15.6.2",
     "react-youtube": "^7.5.0",

diff --git a/client/src/main/scripts/components/CaptionTextNodeList.spec.tsx b/client/src/main/scripts/components/CaptionTextNodeList.spec.tsx
@@ -5,22 +5,34 @@ import CaptionTextNodeList from "./CaptionTextNodeList";
 import { videoFact, videoNodes } from "../utils/testUtils";
 
 const onMouseUp = jest.fn();
+const onScroll = jest.fn();
+
+const eventHandlers = {
+  onMouseUp: onMouseUp,
+  onScroll: onScroll
+};
 const className = "document__text document__text--caption";
 
 jest.mock("./CaptionTextNode", () => ({
   default: "CaptionTextNode"
 }));
 
+const view = {
+  start: 0,
+  end: 5
+};
+
 test("CaptionTextNodeList", () => {
   const tree = renderer
     .create(
       <CaptionTextNodeList
         documentNodes={videoNodes}
-        onMouseUp={onMouseUp}
+        eventHandlers={eventHandlers}
         className={className}
         captionTimer={0}
         captionTranscript={videoFact.transcript}
         speakerMap={videoFact.speakerMap}
+        view={view}
       />
     )
     .toJSON();