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
a4284e48
Commit
a4284e48
authored
May 23, 2017
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use proper message handler. Fix typo
parent
bae06922
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
spec/chatroom.js
spec/chatroom.js
+5
-5
src/converse-muc.js
src/converse-muc.js
+1
-1
No files found.
spec/chatroom.js
View file @
a4284e48
...
...
@@ -488,7 +488,7 @@
to
:
'
dummy@localhost
'
,
type
:
'
groupchat
'
}).
c
(
'
body
'
).
t
(
message
).
tree
();
_converse
.
chatboxes
.
on
Message
(
msg
);
view
.
handleMUC
Message
(
msg
);
expect
(
view
.
$el
.
find
(
'
.chat-message
'
).
hasClass
(
'
mentioned
'
)).
toBeTruthy
();
}));
...
...
@@ -505,7 +505,7 @@
to
:
'
dummy@localhost
'
,
type
:
'
groupchat
'
}).
c
(
'
body
'
).
t
(
message
).
tree
();
_converse
.
chatboxes
.
on
Message
(
msg
);
view
.
handleMUC
Message
(
msg
);
expect
(
_
.
includes
(
view
.
$el
.
find
(
'
.chat-msg-author
'
).
text
(),
'
**Dyon van de Wege
'
)).
toBeTruthy
();
expect
(
view
.
$el
.
find
(
'
.chat-msg-content
'
).
text
()).
toBe
(
'
is tired
'
);
...
...
@@ -516,7 +516,7 @@
to
:
'
dummy@localhost
'
,
type
:
'
groupchat
'
}).
c
(
'
body
'
).
t
(
message
).
tree
();
_converse
.
chatboxes
.
on
Message
(
msg
);
view
.
handleMUC
Message
(
msg
);
expect
(
_
.
includes
(
view
.
$el
.
find
(
'
.chat-msg-author:last
'
).
text
(),
'
**Max Mustermann
'
)).
toBeTruthy
();
expect
(
view
.
$el
.
find
(
'
.chat-msg-content:last
'
).
text
()).
toBe
(
'
is as well
'
);
}));
...
...
@@ -1077,7 +1077,7 @@
* scrollbar.
*/
for
(
var
i
=
0
;
i
<
20
;
i
++
)
{
_converse
.
chatboxes
.
on
Message
(
view
.
handleMUC
Message
(
$msg
({
from
:
'
lounge@localhost/someone
'
,
to
:
'
dummy@localhost.com
'
,
...
...
@@ -1088,7 +1088,7 @@
// Give enough time for `markScrolled` to have been called
setTimeout
(
function
()
{
view
.
$content
.
scrollTop
(
0
);
_converse
.
chatboxes
.
on
Message
(
view
.
handleMUC
Message
(
$msg
({
from
:
'
lounge@localhost/someone
'
,
to
:
'
dummy@localhost.com
'
,
...
...
src/converse-muc.js
View file @
a4284e48
...
...
@@ -544,7 +544,7 @@
.
getExtraMessageClasses
.
apply
(
this
,
arguments
);
if
(
this
.
is_chatroom
&&
attrs
.
sender
===
'
them
'
&&
this
.
model
.
isUserMentioned
(
attrs
.
me
ntioned
))
{
this
.
model
.
isUserMentioned
(
attrs
.
me
ssage
))
{
// Add special class to mark groupchat messages
// in which we are mentioned.
extra_classes
+=
'
mentioned
'
;
...
...
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