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
f9898f32
Commit
f9898f32
authored
Apr 19, 2017
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
converse-notification: MUC nickname wasn't being shown
parent
1e100a67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
docs/CHANGES.md
docs/CHANGES.md
+1
-0
src/converse-notification.js
src/converse-notification.js
+3
-2
No files found.
docs/CHANGES.md
View file @
f9898f32
...
...
@@ -9,6 +9,7 @@
-
sinon 2.1.0
-
eslint 3.19.0
-
Bugfix. MUC user's nickname wasn't being shown in HTML5 notification messages. [jcbrand]
-
#842 Persistent muc room creation not working [jcbrand]
-
#849
`TypeError: _converse.i18n.locale_data is undefined`
when reconnecting. [jcbrand]
...
...
src/converse-notification.js
View file @
f9898f32
...
...
@@ -131,7 +131,8 @@
* message was received.
*/
var
title
,
roster_item
,
from_jid
=
Strophe
.
getBareJidFromJid
(
message
.
getAttribute
(
'
from
'
));
full_from_jid
=
message
.
getAttribute
(
'
from
'
),
from_jid
=
Strophe
.
getBareJidFromJid
(
full_from_jid
);
if
(
message
.
getAttribute
(
'
type
'
)
===
'
headline
'
)
{
if
(
!
_
.
includes
(
from_jid
,
'
@
'
)
||
_converse
.
allow_non_roster_messaging
)
{
title
=
__
(
___
(
"
Notification from %1$s
"
),
from_jid
);
...
...
@@ -142,7 +143,7 @@
// XXX: workaround for Prosody which doesn't give type "headline"
title
=
__
(
___
(
"
Notification from %1$s
"
),
from_jid
);
}
else
if
(
message
.
getAttribute
(
'
type
'
)
===
'
groupchat
'
)
{
title
=
__
(
___
(
"
%1$s says
"
),
Strophe
.
getResourceFromJid
(
from_jid
));
title
=
__
(
___
(
"
%1$s says
"
),
Strophe
.
getResourceFromJid
(
f
ull_f
rom_jid
));
}
else
{
if
(
_
.
isUndefined
(
_converse
.
roster
))
{
_converse
.
log
(
...
...
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