1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00

Merge branch 'develop' into kegan/es6

This commit is contained in:
Kegan Dougal
2017-01-11 10:35:01 +00:00

View File

@@ -1141,14 +1141,6 @@ var _getChromeScreenSharingConstraints = function(call) {
));
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 {
video: {