OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2909 from vector-im/dbkr/enable_screen_sharing 

Enable screen sharing easter-egg in desktop app
pull/2921/head
David Baker 2017-01-11 10:12:57 +00:00 committed by GitHub
parent 6a1af891b7 c5459a2f19
commit 278de1398b
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron/src/electron-main.js
View File

@ -148,6 +148,8 @@ process.on('uncaughtException', function (error) {
electron.ipcMain.on('install_update', installUpdate); electron.ipcMain.on('install_update', installUpdate);
electron.app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');
electron.app.on('ready', () => { electron.app.on('ready', () => {
if (vectorConfig.update_base_url) { if (vectorConfig.update_base_url) {
console.log("Starting auto update with base URL: " + vectorConfig.update_base_url); console.log("Starting auto update with base URL: " + vectorConfig.update_base_url);

4
src/vector/platform/ElectronPlatform.js
View File

@ -127,4 +127,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
getDefaultDeviceDisplayName() { getDefaultDeviceDisplayName() {
return "Riot Desktop on " + platformFriendlyName(); return "Riot Desktop on " + platformFriendlyName();
} }
screenCaptureErrorString() {
return null;
}
} }

8
src/vector/platform/WebPlatform.js
View File

@ -196,4 +196,12 @@ export default class WebPlatform extends VectorBasePlatform {
return app_name + " via " + ua.getBrowser().name + return app_name + " via " + ua.getBrowser().name +
" on " + ua.getOS().name; " on " + ua.getOS().name;
} }
screenCaptureErrorString() {
// it won't work at all if you're not on HTTPS so whine whine whine
if (!global.window || global.window.location.protocol !== "https:") {
return "You need to be using HTTPS to place a screen-sharing call.";
}
return null;
}
} }