haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4438 from jitsi/cs-siteid 

Passes confID when initializing JitsiConference.
This commit is contained in:
Дамян Минков 2019-07-12 14:25:35 +01:00 committed by GitHub
parent e0c8b6b3c0 8a34c0a80f
commit eb1fd4fd88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conference.js
View File

@ -1239,6 +1239,7 @@ export default {
const options = config; const options = config;
const nick = APP.store.getState()['features/base/settings'].displayName; const nick = APP.store.getState()['features/base/settings'].displayName;
const { locationURL } = APP.store.getState()['features/base/connection'];
if (nick) { if (nick) {
options.displayName = nick; options.displayName = nick;
@ -1246,6 +1247,7 @@ export default {
options.applicationName = interfaceConfig.APP_NAME; options.applicationName = interfaceConfig.APP_NAME;
options.getWiFiStatsMethod = this._getWiFiStatsMethod; options.getWiFiStatsMethod = this._getWiFiStatsMethod;
options.confID = `${locationURL.host}${locationURL.pathname}`;
return options; return options;
}, },

4
package-lock.json generated
View File

@ -9042,8 +9042,8 @@
} }
}, },
"lib-jitsi-meet": { "lib-jitsi-meet": {
"version": "github:jitsi/lib-jitsi-meet#8a4d1f1b085131aca3cec5513fa7995cf7508fc2", "version": "github:jitsi/lib-jitsi-meet#24bda8e941c346ccfde6bc1e1bb5dcdbd9450bab",
"from": "github:jitsi/lib-jitsi-meet#8a4d1f1b085131aca3cec5513fa7995cf7508fc2", "from": "github:jitsi/lib-jitsi-meet#24bda8e941c346ccfde6bc1e1bb5dcdbd9450bab",
"requires": { "requires": {
"@jitsi/sdp-interop": "0.1.14", "@jitsi/sdp-interop": "0.1.14",
"@jitsi/sdp-simulcast": "0.2.1", "@jitsi/sdp-simulcast": "0.2.1",

2
package.json
View File

@ -54,7 +54,7 @@
"js-utils": "github:jitsi/js-utils#192b1c996e8c05530eb1f19e82a31069c3021e31", "js-utils": "github:jitsi/js-utils#192b1c996e8c05530eb1f19e82a31069c3021e31",
"jsrsasign": "8.0.12", "jsrsasign": "8.0.12",
"jwt-decode": "2.2.0", "jwt-decode": "2.2.0",
"lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#8a4d1f1b085131aca3cec5513fa7995cf7508fc2", "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#24bda8e941c346ccfde6bc1e1bb5dcdbd9450bab",
"libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d", "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
"lodash": "4.17.11", "lodash": "4.17.11",
"moment": "2.19.4", "moment": "2.19.4",

3
react/features/base/conference/actions.js
View File

@ -393,7 +393,8 @@ export function createConference() {
room.toLowerCase(), { room.toLowerCase(), {
...state['features/base/config'], ...state['features/base/config'],
applicationName: getName(), applicationName: getName(),
getWiFiStatsMethod: getJitsiMeetGlobalNS().getWiFiStats getWiFiStatsMethod: getJitsiMeetGlobalNS().getWiFiStats,
confID: `${locationURL.host}${locationURL.pathname}`
}); });
connection[JITSI_CONNECTION_CONFERENCE_KEY] = conference; connection[JITSI_CONNECTION_CONFERENCE_KEY] = conference;