diff options
| author | Andrew Kim <andrewdkim@users.noreply.github.com> | 2019-03-16 18:25:06 -0400 |
|---|---|---|
| committer | Andrew Kim <andrewdkim@users.noreply.github.com> | 2019-03-16 18:25:06 -0400 |
| commit | 07f7eb81e2eb9b28369c83d02a63e77d5ece14bf (patch) | |
| tree | 3d1c50b5f1a7b4ba496fbf189b9d2d3f3fd89de3 | |
| parent | f8a2744ea03ec03236284939d14787b04b9c8aa6 (diff) | |
| parent | 98dff6ca1915ef006e13532f593219c9bc4ccc97 (diff) | |
merge conflicts resolved
| -rw-r--r-- | deploy/mobile/image.html (renamed from deploy/mobile/image_upload.html) | 2 | ||||
| -rw-r--r-- | deploy/mobile/ink.html (renamed from deploy/mobile/ink_controls.html) | 2 | ||||
| -rw-r--r-- | src/client/views/Main.tsx | 2 | ||||
| -rw-r--r-- | webpack.config.js | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/deploy/mobile/image_upload.html b/deploy/mobile/image.html index 4cfd931ac..0a5f90d79 100644 --- a/deploy/mobile/image_upload.html +++ b/deploy/mobile/image.html @@ -7,7 +7,7 @@ <body> <div id="root"></div> - <script src="../image_upload.js"></script> + <script src="../imageUpload.js"></script> </body> </html>
\ No newline at end of file diff --git a/deploy/mobile/ink_controls.html b/deploy/mobile/ink.html index 725ed3685..938d85794 100644 --- a/deploy/mobile/ink_controls.html +++ b/deploy/mobile/ink.html @@ -7,7 +7,7 @@ <body> <div id="root"></div> - <script src="../ink_controls.js"></script> + <script src="../inkControls.js"></script> </body> </html>
\ No newline at end of file diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx index 9f341b0ed..d73e9b8fe 100644 --- a/src/client/views/Main.tsx +++ b/src/client/views/Main.tsx @@ -104,7 +104,7 @@ Documents.initProtos(mainDocId, (res?: Document) => { <div className="main-buttonDiv" style={{ bottom: '125px' }} > <button onClick={clearDatabase}>Clear Database</button></div> <div className="main-buttonDiv" style={{ bottom: '175px' }} ref={videoRef}> - <button onPointerDown={setupDrag(videoRef, addVideoNode)} onClick={addClick(addVideoNode)}>Add qewfadsfasdfa</button></div> + <button onPointerDown={setupDrag(videoRef, addVideoNode)} onClick={addClick(addVideoNode)}>Add Video</button></div> <div className="main-buttonDiv" style={{ bottom: '200px' }} ref={audioRef}> <button onPointerDown={setupDrag(audioRef, addAudioNode)} onClick={addClick(addAudioNode)}>Add Audio</button></div> <div className="main-buttonDiv" style={{ bottom: '150px' }} ref={pdfRef}> diff --git a/webpack.config.js b/webpack.config.js index 52ad2c653..ff03181c9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,8 +8,8 @@ module.exports = { bundle: ["./src/client/views/Main.tsx", 'webpack-hot-middleware/client?reload=true'], viewer: ["./src/debug/Viewer.tsx", 'webpack-hot-middleware/client?reload=true'], test: ["./src/debug/Test.tsx", 'webpack-hot-middleware/client?reload=true'], - image_upload: ["./src/debug/mobile/ImageUpload.tsx", 'webpack-hot-middleware/client?reload=true'], - ink_control: ["./src/debug/mobile/InkControl.tsx", 'webpack-hot-middleware/client?reload=true'], + inkControls: ["./src/mobile/InkControls.tsx", 'webpack-hot-middleware/client?reload=true'], + imageUpload: ["./src/mobile/ImageUpload.tsx", 'webpack-hot-middleware/client?reload=true'], }, devtool: "source-map", node: { |