noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #758 from thecodingmachine/jitsiConfig

Browse Source 
Jitsi config
This commit is contained in:
grégoire parant 2021-02-18 10:12:16 +01:00 committed by GitHub
commit 3a1b2490ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/WebRtc/JitsiFactory.ts
View File

@ -23,6 +23,8 @@ const mergeConfig = (config?: object) => {
return currentDefaultConfig; return currentDefaultConfig;
} }
return { return {
...currentDefaultConfig,
...config,
startWithAudioMuted: (config as jitsiConfigInterface).startWithAudioMuted ? true : currentDefaultConfig.startWithAudioMuted, startWithAudioMuted: (config as jitsiConfigInterface).startWithAudioMuted ? true : currentDefaultConfig.startWithAudioMuted,
startWithVideoMuted: (config as jitsiConfigInterface).startWithVideoMuted ? true : currentDefaultConfig.startWithVideoMuted, startWithVideoMuted: (config as jitsiConfigInterface).startWithVideoMuted ? true : currentDefaultConfig.startWithVideoMuted,
prejoinPageEnabled: (config as jitsiConfigInterface).prejoinPageEnabled ? true : currentDefaultConfig.prejoinPageEnabled prejoinPageEnabled: (config as jitsiConfigInterface).prejoinPageEnabled ? true : currentDefaultConfig.prejoinPageEnabled

25
maps/Floor0/floor0.json
View File

File diff suppressed because one or more lines are too long

21
maps/tests/jitsi_config.json
View File

@ -34,26 +34,31 @@
"y":0 "y":0
}, },
{ {
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
"height":10, "height":10,
"id":4, "id":5,
"name":"jitsi", "name":"jitsiConf",
"opacity":1, "opacity":1,
"properties":[ "properties":[
{ {
"name":"jitsiConfig", "name":"jitsiConfig",
"type":"string", "type":"string",
"value":"{ \"startWithAudioMuted\": true }" "value":"{ \"startWithAudioMuted\": true, \"startWithVideoMuted\": true } "
}, },
{ {
"name":"jitsiInterfaceConfig", "name":"jitsiInterfaceConfig",
"type":"string", "type":"string",
"value":"{ \"DEFAULT_BACKGROUND\": \"#77ee77\" }" "value":"{\"DEFAULT_BACKGROUND\":\"#77ee77\"}"
}, },
{ {
"name":"jitsiRoom", "name":"jitsiRoom",
"type":"string", "type":"string",
"value":"myRoom avec espace \u00e9\u00e0$&'\"_ \ud83d\ude00" "value":"myRoom avec espace \u00e9\u00e0$&'\"_ \ud83d\ude00"
},
{
"name":"jitsiTrigger",
"type":"string",
"value":"onaction"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,
@ -72,11 +77,11 @@
"x":0, "x":0,
"y":0 "y":0
}], }],
"nextlayerid":5, "nextlayerid":6,
"nextobjectid":1, "nextobjectid":1,
"orientation":"orthogonal", "orientation":"orthogonal",
"renderorder":"right-down", "renderorder":"right-down",
"tiledversion":"1.3.3", "tiledversion":"1.4.3",
"tileheight":32, "tileheight":32,
"tilesets":[ "tilesets":[
{ {
@ -94,6 +99,6 @@
}], }],
"tilewidth":32, "tilewidth":32,
"type":"map", "type":"map",
"version":1.2, "version":1.4,
"width":10 "width":10
} }