pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start treating .Private as a dictionary instead of string

Browse Source
This commit is contained in:
or-else
2018-05-19 16:51:16 -07:00
parent b17e0d45ae
commit d837d8950c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+6 -5
View File
@@ -2036,8 +2036,8 @@
// which don't satisfy the condition. // which don't satisfy the condition.
if (instance.props.filterFunc && instance.props.filter) { if (instance.props.filterFunc && instance.props.filter) {
var content = [key]; var content = [key];
if (c.private) { if (c.private && c.private.comment) {
content.push(("" + c.private).toLowerCase()); content.push(("" + c.private.comment).toLowerCase());
} }
if (c.public && c.public.fn) { if (c.public && c.public.fn) {
content.push(("" + c.public.fn).toLowerCase()); content.push(("" + c.public.fn).toLowerCase());
@@ -2059,7 +2059,8 @@
badges.push({name: 'owner'}); badges.push({name: 'owner'});
} }
} }
var comment = Array.isArray(c.private) ? c.private.join(", ") : c.private; var comment = Array.isArray(c.private) ?
c.private.join(", ") : (c.private ? c.private.comment : null);
contactNodes.push( contactNodes.push(
<Contact <Contact
@@ -2647,7 +2648,7 @@
fullName: topic.public ? topic.public.fn : undefined, fullName: topic.public ? topic.public.fn : undefined,
avatar: makeImageUrl(topic.public ? topic.public.photo : null), avatar: makeImageUrl(topic.public ? topic.public.photo : null),
private: topic.private, private: topic.private ? topic.private.comment : null,
address: topic.name, address: topic.name,
groupTopic: (topic.getType() === "grp"), groupTopic: (topic.getType() === "grp"),
access: acs ? acs.getMode() : undefined, access: acs ? acs.getMode() : undefined,
@@ -4307,7 +4308,7 @@
params.public = pub; params.public = pub;
} }
if (priv) { if (priv) {
params.private = priv; params.private = {comment: priv};
} }
if (permissions) { if (permissions) {
params.defacs = permissions; params.defacs = permissions;