Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
958e8a98
Commit
958e8a98
authored
Aug 18, 2018
by
Emmanuel Gil Peyrot
Committed by
JC Brand
Aug 20, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the roster name or vCard nickname before falling back to vCard fullname or JID.
parent
299fa4f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
src/converse-chatview.js
src/converse-chatview.js
+1
-1
src/converse-roster.js
src/converse-roster.js
+1
-1
src/templates/chatbox_head.html
src/templates/chatbox_head.html
+1
-1
No files found.
src/converse-chatview.js
View file @
958e8a98
...
@@ -208,8 +208,8 @@
...
@@ -208,8 +208,8 @@
render
()
{
render
()
{
this
.
el
.
innerHTML
=
tpl_chatbox_head
(
this
.
el
.
innerHTML
=
tpl_chatbox_head
(
_
.
extend
(
_
.
extend
(
this
.
model
.
toJSON
(),
this
.
model
.
vcard
.
toJSON
(),
this
.
model
.
vcard
.
toJSON
(),
this
.
model
.
toJSON
(),
{
'
_converse
'
:
_converse
,
{
'
_converse
'
:
_converse
,
'
info_close
'
:
__
(
'
Close this chat box
'
)
'
info_close
'
:
__
(
'
Close this chat box
'
)
}
}
...
...
src/converse-roster.js
View file @
958e8a98
...
@@ -247,7 +247,7 @@
...
@@ -247,7 +247,7 @@
},
},
getDisplayName
()
{
getDisplayName
()
{
return
this
.
vcard
.
get
(
'
fullname
'
)
||
this
.
get
(
'
jid
'
);
return
this
.
get
(
'
nickname
'
)
||
this
.
vcard
.
get
(
'
nickname
'
)
||
this
.
vcard
.
get
(
'
fullname
'
)
||
this
.
get
(
'
jid
'
);
},
},
getFullname
()
{
getFullname
()
{
...
...
src/templates/chatbox_head.html
View file @
958e8a98
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
{[ if (o.url) { ]}
{[ if (o.url) { ]}
<a
href=
"{{{o.url}}}"
target=
"_blank"
rel=
"noopener"
class=
"user"
>
<a
href=
"{{{o.url}}}"
target=
"_blank"
rel=
"noopener"
class=
"user"
>
{[ } ]}
{[ } ]}
{{{ o.fullname || o.jid }}}
{{{ o.
nickname || o.
fullname || o.jid }}}
{[ if (o.url) { ]}
{[ if (o.url) { ]}
</a>
</a>
{[ } ]}
{[ } ]}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment