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
af091faf
Commit
af091faf
authored
Jan 22, 2019
by
Holger Weiss
Committed by
JC Brand
Jan 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resurrect muc_show_join_leave option
The option got lost in commit
9528d81c
. Fixes #1263
parent
26b0934a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
CHANGES.md
CHANGES.md
+1
-0
dist/converse.js
dist/converse.js
+2
-2
src/converse-muc-views.js
src/converse-muc-views.js
+5
-2
No files found.
CHANGES.md
View file @
af091faf
...
...
@@ -9,6 +9,7 @@
-
#1408 new config option
`roomconfig_whitelist`
-
#1417 Margin between nickname and badge
-
#1421 fix direct invite for membersonly room
-
#1422 Resurrect the
`muc_show_join_leave`
option
## 4.1.0 (2019-01-11)
...
...
dist/converse.js
View file @
af091faf
...
...
@@ -54801,7 +54801,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
},
showJoinNotification(occupant) {
if (this.model.get('connection_status') !== _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].ROOMSTATUS.ENTERED) {
if (
!_converse.muc_show_join_leave ||
this.model.get('connection_status') !== _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].ROOMSTATUS.ENTERED) {
return;
}
...
...
@@ -54861,7 +54861,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
},
showLeaveNotification(occupant) {
if (_.includes(occupant.get('states'), '303') || _.includes(occupant.get('states'), '307')) {
if (
!_converse.muc_show_join_leave ||
_.includes(occupant.get('states'), '303') || _.includes(occupant.get('states'), '307')) {
return;
}
src/converse-muc-views.js
View file @
af091faf
...
...
@@ -1523,7 +1523,8 @@ converse.plugins.add('converse-muc-views', {
},
showJoinNotification
(
occupant
)
{
if
(
this
.
model
.
get
(
'
connection_status
'
)
!==
converse
.
ROOMSTATUS
.
ENTERED
)
{
if
(
!
_converse
.
muc_show_join_leave
||
this
.
model
.
get
(
'
connection_status
'
)
!==
converse
.
ROOMSTATUS
.
ENTERED
)
{
return
;
}
const
nick
=
occupant
.
get
(
'
nick
'
),
...
...
@@ -1576,7 +1577,9 @@ converse.plugins.add('converse-muc-views', {
},
showLeaveNotification
(
occupant
)
{
if
(
_
.
includes
(
occupant
.
get
(
'
states
'
),
'
303
'
)
||
_
.
includes
(
occupant
.
get
(
'
states
'
),
'
307
'
))
{
if
(
!
_converse
.
muc_show_join_leave
||
_
.
includes
(
occupant
.
get
(
'
states
'
),
'
303
'
)
||
_
.
includes
(
occupant
.
get
(
'
states
'
),
'
307
'
))
{
return
;
}
const
nick
=
occupant
.
get
(
'
nick
'
),
...
...
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