matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Merge branch 'develop' into kegan/es6

Browse Source
This commit is contained in:
Kegan Dougal
2017-01-11 10:35:01 +00:00
parent 6644151d19 94d79edbd0
commit 101970dcd9
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/webrtc/call.js
View File

@@ -1141,14 +1141,6 @@ var _getChromeScreenSharingConstraints = function(call) {
)); ));
return; return;
} }
// it won't work at all if you're not on HTTPS so whine whine whine
if (!global.window || global.window.location.protocol !== "https:") {
call.emit("error", callError(
MatrixCall.ERR_NO_USER_MEDIA,
"You need to be using HTTPS to place a screen-sharing call."
));
return;
}
return { return {
video: { video: {