Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xwiki-platform
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
XWiki
xwiki-platform
Commits
eeb15b9a
Commit
eeb15b9a
authored
1 year ago
by
Marius Dumitru Florea
Browse files
Options
Downloads
Patches
Plain Diff
[misc] Fix bad refactoring.
parent
195b10a0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/toolbar.js
+4
-4
4 additions, 4 deletions
...xwiki-platform-realtime-webjar/src/main/webjar/toolbar.js
with
4 additions
and
4 deletions
xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/toolbar.js
+
4
−
4
View file @
eeb15b9a
...
...
@@ -58,8 +58,8 @@ define('xwiki-realtime-toolbar', [
return
$
(
'
<div class="rt-user-list"></div>
'
).
attr
(
'
id
'
,
uid
()).
appendTo
(
$container
)[
0
];
}
const
userDisplayMode
=
Config
.
toolbarUserlist
;
function
getOtherUsers
(
myUserId
,
userList
,
usersData
)
{
const
displayConfig
=
Config
.
toolbarUserlist
;
return
userList
.
map
(
function
(
userId
)
{
// Collect the user data.
const
userData
=
usersData
?.[
userId
];
...
...
@@ -85,7 +85,7 @@ define('xwiki-realtime-toolbar', [
// Filter out users without data.
return
user
;
// Display each user. We don't need to separate the users with comma if the avatars are displayed.
}).
map
(
displayUser
).
join
((
d
isplay
Config
===
'
avatar
'
||
d
isplay
Config
===
'
both
'
)
?
''
:
'
,
'
);
}).
map
(
displayUser
).
join
((
userD
isplay
Mode
===
'
avatar
'
||
userD
isplay
Mode
===
'
both
'
)
?
''
:
'
,
'
);
}
function
displayUser
(
user
)
{
...
...
@@ -95,10 +95,10 @@ define('xwiki-realtime-toolbar', [
'
data-id
'
:
user
.
id
,
'
data-reference
'
:
user
.
reference
});
if
(
d
isplay
Config
===
undefined
||
d
isplay
Config
===
'
name
'
||
d
isplay
Config
===
'
both
'
)
{
if
(
userD
isplay
Mode
===
undefined
||
userD
isplay
Mode
===
'
name
'
||
userD
isplay
Mode
===
'
both
'
)
{
userDisplay
.
text
(
user
.
name
);
}
if
(
d
isplay
Config
===
'
avatar
'
||
d
isplay
Config
===
'
both
'
)
{
if
(
userD
isplay
Mode
===
'
avatar
'
||
userD
isplay
Mode
===
'
both
'
)
{
if
(
user
.
avatar
)
{
$
(
'
<img class="rt-user-avatar"/>
'
).
attr
({
src
:
user
.
avatar
,
...
...
This diff is collapsed.
Click to expand it.
Git Mirror User
@gitmirror
mentioned in commit
01db5b19
·
1 year ago
mentioned in commit
01db5b19
mentioned in commit 01db5b191f2bf429a3ee136e01cd1e772ca50fda
Toggle commit list
Git Mirror User
@gitmirror
mentioned in commit
5f89d70a
·
1 year ago
mentioned in commit
5f89d70a
mentioned in commit 5f89d70a4a4dda03f70858c166d92b4f6f75d715
Toggle commit list
Git Mirror User
@gitmirror
mentioned in commit
1b56c4dc
·
1 year ago
mentioned in commit
1b56c4dc
mentioned in commit 1b56c4dc412809073a78fda289878dc435bdd7ca
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment