diff options
| author | Mohammad Amoush <47069173+mamoush34@users.noreply.github.com> | 2020-02-12 17:49:03 -0500 |
|---|---|---|
| committer | Mohammad Amoush <47069173+mamoush34@users.noreply.github.com> | 2020-02-12 17:49:03 -0500 |
| commit | 1186a4fec0099fee1b9896d58a29cb0661757af3 (patch) | |
| tree | fee9456804ce3abd3ca17db0b1d71130bdd66927 /src/client/views/webcam | |
| parent | 4059607ef104a2d3d59e505a3ec0ae2820df3160 (diff) | |
| parent | c5b030f9b00fad5b3ee5e34c6d095519084bb2cf (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into webcam_mohammad
Diffstat (limited to 'src/client/views/webcam')
| -rw-r--r-- | src/client/views/webcam/WebCamLogic.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client/views/webcam/WebCamLogic.js b/src/client/views/webcam/WebCamLogic.js index d5330af9a..f542fb983 100644 --- a/src/client/views/webcam/WebCamLogic.js +++ b/src/client/views/webcam/WebCamLogic.js @@ -104,9 +104,9 @@ export function initialize(roomName, handlerUI) { navigator.mediaDevices.getUserMedia({ - audio: true, - video: true - }) + audio: true, + video: true + }) .then(gotStream) .catch(function (e) { alert('getUserMedia() error: ' + e.name); @@ -154,7 +154,7 @@ export function initialize(roomName, handlerUI) { if (location.hostname !== 'localhost') { requestTurn( - 'https://computeengineondemand.appspot.com/turn?username=41784574&key=4080218913' + `${window.location.origin}/corsProxy/${encodeURIComponent("https://computeengineondemand.appspot.com/turn?username=41784574&key=4080218913")}` ); } |