Conversation
|
|
| }; | ||
| }, {}], | ||
| 17: [function (require, module, exports) { | ||
| module.exports = function Saving(options) { |
There was a problem hiding this comment.
So here, I believe this whole section was actually removed in #268, so I think we can leave this out.
| return true; | ||
| }); | ||
| $("#webcam-activate").click(function () { | ||
| if(isVideo){ |
| $('#preset-modal').modal('show'); | ||
| return true; | ||
| }); | ||
|
|
| setGrid($("#overlay-slider").val()); | ||
| }); | ||
|
|
||
| //Start video controls |
| Presets = require('../ui/presets')(options, save_infragrammar_inputs); | ||
| Analysis = require('../ui/analysis')(options, save_infragrammar_inputs); | ||
| Colorize = require('../ui/colorize')(options); | ||
| Saving = require('../ui/saving')(options); |
There was a problem hiding this comment.
This can be removed, as mentioned below it was removed in #268
| clientX: 0, | ||
| clientY: 0 | ||
| })); | ||
| event = document.createEvent("MouseEvents"); |
There was a problem hiding this comment.
I believe the above changes were made in #324 so we should leave it as it is with dispatchEvent. Thank you!
| webRtcOptions.videoEl.setAttribute('autoplay', 'autoplay'); | ||
| webRtcOptions.videoEl.setAttribute('playsinline', 'playsinline'); | ||
| getUserMedia(webRtcOptions, success, deviceError); // iOS Safari 11 compatibility: https://github.com/webrtc/adapter/issues/685 | ||
| webRtcOptions.videoEl.setAttribute('id', 'webCamVideoEl'); |
There was a problem hiding this comment.
These changes can be made in this file:
Line 13 in 3f5f87a
|
|
||
| function success(stream) { | ||
| var video; | ||
| //localStream = this.stream; |
There was a problem hiding this comment.
These too, just lower in the same file:
Line 79 in 3f5f87a
| @@ -1,14 +1,15 @@ | |||
| function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } | |||
| isVideo = false,isCamera=false; // Turns off camera feed | |||
There was a problem hiding this comment.
Are these global variables? Could we set them actually inside of the camera.js file instead, and use var?
Line 3 in 3f5f87a
1 participant
Trying to show a diff for @Forchapeatl from #419