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
f78a1372
Commit
f78a1372
authored
Apr 27, 2020
by
Christoph Scholz
Committed by
JC Brand
Apr 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix rendering of `muc_roomid_policy_hint`
parent
0c5593ed
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
CHANGES.md
CHANGES.md
+2
-1
src/converse-muc-views.js
src/converse-muc-views.js
+1
-2
src/templates/add_chatroom_modal.js
src/templates/add_chatroom_modal.js
+3
-2
No files found.
CHANGES.md
View file @
f78a1372
...
...
@@ -18,9 +18,10 @@ Soon we'll deprecate the latter, so prepare now.
and
[
muc_roomid_policy_hint
](
https://conversejs.org/docs/html/configuration.html#muc-roomid-policy-hint
)
-
#1826: A user can now add himself as a contact
-
#1839: Headline messages are shown in controlbox
-
#1896: Don't send receipts for messages fetched from the archive
-
#1896: Don't send receipts for messages fetched from the archive
-
#1937: Editing a message removes the mentions highlight
-
#1963: Mentions are visually incorrect when used in message replies
-
#2002: fix rendering of
`muc_roomid_policy_hint`
-
Allow ignoring of bootstrap modules at build using environment variable. For xample:
`export BOOTSTRAP_IGNORE_MODULES="Modal,Dropdown" && make dist`
-
Bugfix. Handle stanza that clears the MUC subject
-
Replace Backbone with
[
Skeletor
](
https://github.com/skeletorjs/skeletor
)
...
...
src/converse-muc-views.js
View file @
f78a1372
...
...
@@ -33,7 +33,6 @@ import tpl_muc_sidebar from "templates/muc_sidebar.js";
import
tpl_room_description
from
"
templates/room_description.html
"
;
import
tpl_room_panel
from
"
templates/room_panel.html
"
;
import
tpl_spinner
from
"
templates/spinner.html
"
;
import
xss
from
"
xss/dist/xss
"
;
const
{
Strophe
,
sizzle
,
$iq
,
$pres
}
=
converse
.
env
;
const
u
=
converse
.
env
.
utils
;
...
...
@@ -543,7 +542,7 @@ converse.plugins.add('converse-muc-views', {
'
label_room_address
'
:
_converse
.
muc_domain
?
__
(
'
Groupchat name
'
)
:
__
(
'
Groupchat address
'
),
'
chatroom_placeholder
'
:
placeholder
,
'
muc_roomid_policy_error_msg
'
:
this
.
muc_roomid_policy_error_msg
,
'
muc_roomid_policy_hint
'
:
xss
.
filterXSS
(
_converse
.
muc_roomid_policy_hint
,
{
'
whiteList
'
:
{
b
:
[],
br
:
[],
em
:
[]}})
'
muc_roomid_policy_hint
'
:
_converse
.
muc_roomid_policy_hint
}));
},
...
...
src/templates/add_chatroom_modal.js
View file @
f78a1372
import
{
html
}
from
"
lit-html
"
;
import
{
unsafeHTML
}
from
"
lit-html/directives/unsafe-html.js
"
;
import
{
__
}
from
'
@converse/headless/i18n
'
;
import
{
modal_header_close_button
}
from
"
./buttons
"
import
xss
from
"
xss/dist/xss
"
;
const
i18n_join
=
__
(
'
Join
'
);
const
i18n_enter
=
__
(
'
Enter a new Groupchat
'
);
...
...
@@ -32,7 +33,7 @@ export default (o) => html`
${
(
o
.
muc_roomid_policy_error_msg
)
?
html
`<label class="roomid-policy-error">
${
o
.
muc_roomid_policy_error_msg
}
</label>`
:
''
}
<input type="text" required="required" name="chatroom" class="form-control roomjid-input" placeholder="
${
o
.
chatroom_placeholder
}
"/>
</div>
${
o
.
muc_roomid_policy_hint
?
html
`<div class="form-group">
{{o.muc_roomid_policy_hint}
}</div>`
:
''
}
${
o
.
muc_roomid_policy_hint
?
html
`<div class="form-group">
${
unsafeHTML
(
xss
.
filterXSS
(
o
.
muc_roomid_policy_hint
,
{
'
whiteList
'
:
{
b
:
[],
br
:
[],
em
:
[]}}))
}
<
/div>` : ''
}
$
{
!
o
.
_converse
.
locked_muc_nickname
?
nickname_input
(
o
)
:
''
}
<input type="submit" class="btn btn-primary" name="join" value="
${
i18n_join
||
''
}
" ?disabled=
${
o
.
muc_roomid_policy_error_msg
}
>
</form>
...
...
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