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
616731b3
Commit
616731b3
authored
Mar 27, 2019
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't show MUC domain if `locked_muc_domain` is set to `'hidden'`
parent
fb89148b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
4 deletions
+20
-4
dist/converse.js
dist/converse.js
+11
-2
docs/source/configuration.rst
docs/source/configuration.rst
+5
-1
src/converse-muc-views.js
src/converse-muc-views.js
+1
-0
src/templates/chatroom_head.html
src/templates/chatroom_head.html
+3
-1
No files found.
dist/converse.js
View file @
616731b3
...
@@ -54467,6 +54467,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_6__["default"].plugins
...
@@ -54467,6 +54467,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_6__["default"].plugins
/* Returns the heading HTML to be rendered.
/* Returns the heading HTML to be rendered.
*/
*/
return templates_chatroom_head_html__WEBPACK_IMPORTED_MODULE_16___default()(_.extend(this.model.toJSON(), {
return templates_chatroom_head_html__WEBPACK_IMPORTED_MODULE_16___default()(_.extend(this.model.toJSON(), {
'_converse': _converse,
'Strophe': Strophe,
'Strophe': Strophe,
'info_close': __('Close and leave this groupchat'),
'info_close': __('Close and leave this groupchat'),
'info_configure': __('Configure this groupchat'),
'info_configure': __('Configure this groupchat'),
...
@@ -93495,12 +93496,20 @@ var _ = {escape:__webpack_require__(/*! ./node_modules/lodash/escape.js */ "./no
...
@@ -93495,12 +93496,20 @@ var _ = {escape:__webpack_require__(/*! ./node_modules/lodash/escape.js */ "./no
module.exports = function(o) {
module.exports = function(o) {
var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
function print() { __p += __j.call(arguments, '') }
function print() { __p += __j.call(arguments, '') }
__p += '<!-- src/templates/chatroom_head.html -->\n<div class="chatbox-navback"><i class="fa fa-arrow-left"></i></div>\n<div class="chatbox-title">\n <div class="chat-title" title="' +
__p += '<!-- src/templates/chatroom_head.html -->\n<div class="chatbox-navback"><i class="fa fa-arrow-left"></i></div>\n<div class="chatbox-title">\n <div class="chat-title" ';
if (o._converse.locked_muc_domain !== 'hidden') { ;
__p += ' title="' +
__e(o.jid) +
__e(o.jid) +
'">\n ';
'" ';
} ;
__p += ' >\n ';
if (o.name && o.name !== o.Strophe.getNodeFromJid(o.jid)) { ;
if (o.name && o.name !== o.Strophe.getNodeFromJid(o.jid)) { ;
__p += '\n ' +
__p += '\n ' +
__e( o.name ) +
__e( o.name ) +
'\n ';
} else if (o._converse.locked_muc_domain === 'hidden') { ;
__p += '\n ' +
__e( o.Strophe.getNodeFromJid(o.jid) ) +
'\n ';
'\n ';
} else { ;
} else { ;
__p += '\n ' +
__p += '\n ' +
docs/source/configuration.rst
View file @
616731b3
...
@@ -882,10 +882,14 @@ locked_muc_domain
...
@@ -882,10 +882,14 @@ locked_muc_domain
-----------------
-----------------
* Default: ``false``
* Default: ``false``
* Allowed values: ``false``, ``true``, ``'hidden'``
This setting allows you to
restrict the multi-user chat (MUC) domain to only the value
By setting this value to something truthy, you
restrict the multi-user chat (MUC) domain to only the value
specified in `muc_domain`_.
specified in `muc_domain`_.
If the value is set to `'hidden'` (which is also truthy), then the MUC domain
will not be shown to users.
locked_muc_nickname
locked_muc_nickname
-------------------
-------------------
...
...
src/converse-muc-views.js
View file @
616731b3
...
@@ -694,6 +694,7 @@ converse.plugins.add('converse-muc-views', {
...
@@ -694,6 +694,7 @@ converse.plugins.add('converse-muc-views', {
*/
*/
return
tpl_chatroom_head
(
return
tpl_chatroom_head
(
_
.
extend
(
this
.
model
.
toJSON
(),
{
_
.
extend
(
this
.
model
.
toJSON
(),
{
'
_converse
'
:
_converse
,
'
Strophe
'
:
Strophe
,
'
Strophe
'
:
Strophe
,
'
info_close
'
:
__
(
'
Close and leave this groupchat
'
),
'
info_close
'
:
__
(
'
Close and leave this groupchat
'
),
'
info_configure
'
:
__
(
'
Configure this groupchat
'
),
'
info_configure
'
:
__
(
'
Configure this groupchat
'
),
...
...
src/templates/chatroom_head.html
View file @
616731b3
<div
class=
"chatbox-navback"
><i
class=
"fa fa-arrow-left"
></i></div>
<div
class=
"chatbox-navback"
><i
class=
"fa fa-arrow-left"
></i></div>
<div
class=
"chatbox-title"
>
<div
class=
"chatbox-title"
>
<div
class=
"chat-title"
title=
"{{{o.jid}}}"
>
<div
class=
"chat-title"
{[
if
(
o
.
_converse
.
locked_muc_domain
!==
'
hidden
')
{
]}
title=
"{{{o.jid}}}"
{[
}
]}
>
{[ if (o.name
&&
o.name !== o.Strophe.getNodeFromJid(o.jid)) { ]}
{[ if (o.name
&&
o.name !== o.Strophe.getNodeFromJid(o.jid)) { ]}
{{{ o.name }}}
{{{ o.name }}}
{[ } else if (o._converse.locked_muc_domain === 'hidden') { ]}
{{{ o.Strophe.getNodeFromJid(o.jid) }}}
{[ } else { ]}
{[ } else { ]}
{{{ o.Strophe.getNodeFromJid(o.jid) }}}@{{{ o.Strophe.getDomainFromJid(o.jid) }}}
{{{ o.Strophe.getNodeFromJid(o.jid) }}}@{{{ o.Strophe.getDomainFromJid(o.jid) }}}
{[ } ]}
{[ } ]}
...
...
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