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

On adding participant show the initial status text if any. (#2220) 

* On adding participant show the initial status text if any.

When participant joins and there is an initial status we show it, instead of the connected notification. If initial status is missing proceed with the default user connected notification.

* Updates to latest lib-jitsi-meet (365bd886ee).

* Adds a fixme comment.

* Updates to latest lib-jitsi-meet (365bd886ee).
This commit is contained in:
Дамян Минков 2017-11-27 17:05:53 -06:00 committed by virtuacoplenny
parent 8e8edb0793
commit 345fcefa7d
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/UI/UI.js
View File

@ -27,6 +27,7 @@ import { updateDeviceList } from '../../react/features/base/devices';
import { JitsiTrackErrors } from '../../react/features/base/lib-jitsi-meet';
import {
getLocalParticipant,
participantPresenceChanged,
showParticipantJoinedNotification
} from '../../react/features/base/participants';
import { openDisplayNamePrompt } from '../../react/features/display-name';
@ -475,8 +476,18 @@ UI.getSharedDocumentManager = () => etherpadManager;
UI.addUser = function(user) {
const id = user.getId();
const displayName = user.getDisplayName();
const status = user.getStatus();
APP.store.dispatch(showParticipantJoinedNotification(displayName));
if (status) {
// if user has initial status dispatch it
// and skip 'connected' notifications
APP.store.dispatch(participantPresenceChanged(id, status));
// FIXME: move updateUserStatus in participantPresenceChanged action
UI.updateUserStatus(user, status);
} else {
APP.store.dispatch(showParticipantJoinedNotification(displayName));
}
if (!config.startAudioMuted
|| config.startAudioMuted > APP.conference.membersCount) {

2
package-lock.json generated
View File

@ -10991,7 +10991,7 @@
}
},
"lib-jitsi-meet": {
"version": "github:jitsi/lib-jitsi-meet#1c743d65eeccbbd63c765dc84d832112c907422a",
"version": "github:jitsi/lib-jitsi-meet#365bd886ee9de81f5d9bd731a57e3b75ab0e766f",
"requires": {
"async": "0.9.0",
"current-executing-script": "0.1.3",

2
package.json
View File

@ -46,7 +46,7 @@
"js-md5": "0.6.1",
"jssha": "2.2.0",
"jwt-decode": "2.2.0",
"lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#1c743d65eeccbbd63c765dc84d832112c907422a",
"lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#365bd886ee9de81f5d9bd731a57e3b75ab0e766f",
"lodash": "4.17.4",
"nuclear-js": "1.4.0",
"postis": "2.2.0",