integrate screen sharing tracker window (#197)
* integrate screen sharing tracker window * update jitsi-meet-electron-utils required version * update package.json
This commit is contained in:
parent
30eb64fadd
commit
3c448837e7
|
@ -9,7 +9,7 @@ import { push } from 'react-router-redux';
|
|||
|
||||
import {
|
||||
RemoteControl,
|
||||
setupScreenSharingForWindow,
|
||||
setupScreenSharingRender,
|
||||
setupAlwaysOnTopRender,
|
||||
initPopupsConfigurationRender,
|
||||
setupWiFiStats,
|
||||
|
@ -263,7 +263,7 @@ class Conference extends Component<Props, State> {
|
|||
|
||||
const iframe = this._api.getIFrame();
|
||||
|
||||
setupScreenSharingForWindow(iframe);
|
||||
setupScreenSharingRender(this._api);
|
||||
new RemoteControl(iframe); // eslint-disable-line no-new
|
||||
setupAlwaysOnTopRender(this._api);
|
||||
setupWiFiStats(iframe);
|
||||
|
|
4
main.js
4
main.js
|
@ -13,7 +13,8 @@ const {
|
|||
initPopupsConfigurationMain,
|
||||
getPopupTarget,
|
||||
setupAlwaysOnTopMain,
|
||||
setupPowerMonitorMain
|
||||
setupPowerMonitorMain,
|
||||
setupScreenSharingMain
|
||||
} = require('jitsi-meet-electron-utils');
|
||||
const path = require('path');
|
||||
const URL = require('url');
|
||||
|
@ -149,6 +150,7 @@ function createJitsiMeetWindow() {
|
|||
initPopupsConfigurationMain(mainWindow);
|
||||
setupAlwaysOnTopMain(mainWindow);
|
||||
setupPowerMonitorMain(mainWindow);
|
||||
setupScreenSharingMain(mainWindow, 'Jitsi Meet');
|
||||
|
||||
mainWindow.webContents.on('new-window', (event, url, frameName) => {
|
||||
const target = getPopupTarget(url, frameName);
|
||||
|
|
|
@ -2477,9 +2477,9 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"readable-stream": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
|
||||
"integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
|
||||
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
|
||||
"requires": {
|
||||
"inherits": "^2.0.3",
|
||||
"string_decoder": "^1.1.1",
|
||||
|
@ -6052,8 +6052,8 @@
|
|||
}
|
||||
},
|
||||
"jitsi-meet-electron-utils": {
|
||||
"version": "github:jitsi/jitsi-meet-electron-utils#3b6562f4d6104bfb5099414d1a79d4164767ea9b",
|
||||
"from": "github:jitsi/jitsi-meet-electron-utils#v1.1.1",
|
||||
"version": "github:jitsi/jitsi-meet-electron-utils#fcdcc578737472b51a5effd1c6328051700b6130",
|
||||
"from": "github:jitsi/jitsi-meet-electron-utils#v2.0.0",
|
||||
"requires": {
|
||||
"nan": "^2.14.0",
|
||||
"postis": "^2.2.0",
|
||||
|
@ -6628,9 +6628,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"mimic-response": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz",
|
||||
"integrity": "sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ=="
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
|
||||
"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
|
||||
},
|
||||
"minimalistic-assert": {
|
||||
"version": "1.0.1",
|
||||
|
@ -6809,9 +6809,9 @@
|
|||
}
|
||||
},
|
||||
"node-abi": {
|
||||
"version": "2.13.0",
|
||||
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.13.0.tgz",
|
||||
"integrity": "sha512-9HrZGFVTR5SOu3PZAnAY2hLO36aW1wmA+FDsVkr85BTST32TLCA1H/AEcatVRAsWLyXS3bqUDYCAjq5/QGuSTA==",
|
||||
"version": "2.15.0",
|
||||
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz",
|
||||
"integrity": "sha512-FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg==",
|
||||
"requires": {
|
||||
"semver": "^5.4.1"
|
||||
}
|
||||
|
@ -9066,9 +9066,9 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"readable-stream": {
|
||||
"version": "3.5.0",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
|
||||
"integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
|
||||
"version": "3.6.0",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
|
||||
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
|
||||
"requires": {
|
||||
"inherits": "^2.0.3",
|
||||
"string_decoder": "^1.1.1",
|
||||
|
|
|
@ -96,7 +96,7 @@
|
|||
"electron-updater": "4.0.6",
|
||||
"electron-window-state": "5.0.3",
|
||||
"history": "4.7.2",
|
||||
"jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v1.1.1",
|
||||
"jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v2.0.0",
|
||||
"js-utils": "github:jitsi/js-utils#0c53500a5120be2aa3fc590f0f932a0d4771920f",
|
||||
"moment": "2.23.0",
|
||||
"mousetrap": "1.6.2",
|
||||
|
|
Loading…
Reference in New Issue