web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix userlist notifications missing for join events

Browse Source
This commit is contained in:
yflory 2018-03-14 16:34:44 +01:00
parent ebef99e5cf
commit d6228a39bd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/outer/async-store.js
View File

@ -372,7 +372,7 @@ define([
var metadata = { var metadata = {
// "user" is shared with everybody via the userlist // "user" is shared with everybody via the userlist
user: { user: {
name: store.proxy[Constants.displayNameKey], name: store.proxy[Constants.displayNameKey] || "",
uid: store.proxy.uid, uid: store.proxy.uid,
avatar: Util.find(store.proxy, ['profile', 'avatar']), avatar: Util.find(store.proxy, ['profile', 'avatar']),
profile: Util.find(store.proxy, ['profile', 'view']), profile: Util.find(store.proxy, ['profile', 'view']),

2
www/common/toolbar3.js
View File

@ -885,7 +885,6 @@ define([
var oldUserData; var oldUserData;
if (!config.metadataMgr) { return; } if (!config.metadataMgr) { return; }
var metadataMgr = config.metadataMgr; var metadataMgr = config.metadataMgr;
var userNetfluxId = metadataMgr.getNetfluxId();
var notify = function(type, name, oldname) { var notify = function(type, name, oldname) {
// type : 1 (+1 user), 0 (rename existing user), -1 (-1 user) // type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
if (typeof name === "undefined") { return; } if (typeof name === "undefined") { return; }
@ -929,6 +928,7 @@ define([
metadataMgr.onChange(function () { metadataMgr.onChange(function () {
var newdata = metadataMgr.getMetadata().users; var newdata = metadataMgr.getMetadata().users;
var netfluxIds = Object.keys(newdata); var netfluxIds = Object.keys(newdata);
var userNetfluxId = metadataMgr.getNetfluxId();
// Notify for disconnected users // Notify for disconnected users
if (typeof oldUserData !== "undefined") { if (typeof oldUserData !== "undefined") {
for (var u in oldUserData) { for (var u in oldUserData) {