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
d17ae811
Commit
d17ae811
authored
Jan 15, 2020
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More CSS and test fixes
parent
f367157d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
8 deletions
+23
-8
sass/_controlbox.scss
sass/_controlbox.scss
+11
-1
spec/muc.js
spec/muc.js
+2
-2
src/converse-chatview.js
src/converse-chatview.js
+9
-5
webpack.html
webpack.html
+1
-0
No files found.
sass/_controlbox.scss
View file @
d17ae811
...
...
@@ -308,7 +308,7 @@
left
:
0
;
text-align
:
left
;
overflow-x
:
hidden
;
padding
:
1em
0
1em
0
;
padding
:
0
0
1em
0
;
.controlbox-padded
{
padding-left
:
1em
;
...
...
@@ -407,6 +407,7 @@
flex-direction
:
row-reverse
;
flex-wrap
:
nowrap
;
justify-content
:
space-between
;
min-height
:
0
;
.brand-heading
{
color
:
var
(
--
text-color
);
...
...
@@ -605,6 +606,12 @@
}
}
#conversejs
.converse-fullscreen
{
.controlbox-panes
{
padding-top
:
1em
;
}
}
#conversejs
.converse-overlayed
{
.brand-heading
{
padding-top
:
0
.8rem
;
...
...
@@ -618,5 +625,8 @@
#converse-login-panel
{
height
:
100%
;
}
.controlbox-panes
{
margin-top
:
0
.5em
;
}
}
}
spec/muc.js
View file @
d17ae811
...
...
@@ -2506,7 +2506,7 @@
expect
(
chatroomview
.
model
.
features
.
get
(
'
temporary
'
)).
toBe
(
true
);
expect
(
chatroomview
.
model
.
features
.
get
(
'
unmoderated
'
)).
toBe
(
true
);
expect
(
chatroomview
.
model
.
features
.
get
(
'
unsecured
'
)).
toBe
(
false
);
expect
(
chatroomview
.
el
.
querySelector
(
'
.chat
-title
'
).
textContent
.
trim
()).
toBe
(
'
Room
'
);
expect
(
chatroomview
.
el
.
querySelector
(
'
.chat
box-title__text
'
).
textContent
.
trim
()).
toBe
(
'
Room
'
);
chatroomview
.
el
.
querySelector
(
'
.configure-chatroom-button
'
).
click
();
...
...
@@ -2656,7 +2656,7 @@
expect
(
chatroomview
.
model
.
features
.
get
(
'
temporary
'
)).
toBe
(
true
);
expect
(
chatroomview
.
model
.
features
.
get
(
'
unmoderated
'
)).
toBe
(
true
);
expect
(
chatroomview
.
model
.
features
.
get
(
'
unsecured
'
)).
toBe
(
false
);
expect
(
chatroomview
.
el
.
querySelector
(
'
.chat
-title
'
).
textContent
.
trim
()).
toBe
(
'
New room name
'
);
expect
(
chatroomview
.
el
.
querySelector
(
'
.chat
box-title__text
'
).
textContent
.
trim
()).
toBe
(
'
New room name
'
);
done
();
}));
...
...
src/converse-chatview.js
View file @
d17ae811
...
...
@@ -814,16 +814,20 @@ converse.plugins.add('converse-chatview', {
*/
_converse
.
api
.
trigger
(
'
messageSend
'
,
message
);
}
const
el
=
this
.
content
.
parentElement
;
el
.
style
.
display
=
'
none
'
;
if
(
_converse
.
view_mode
===
'
overlayed
'
)
{
// XXX: Chrome flex bug workaround. The .chat-content area
// doesn't resize when the textarea is resized to its original size.
this
.
content
.
parentElement
.
style
.
display
=
'
none
'
;
}
textarea
.
removeAttribute
(
'
disabled
'
);
u
.
removeClass
(
'
disabled
'
,
textarea
);
textarea
.
focus
();
// XXX: Chrome flex bug workaround. The .chat-content area
// doesn't resize when the textarea is resized to its original size.
el
.
style
.
display
=
''
;
if
(
_converse
.
view_mode
===
'
overlayed
'
)
{
// XXX: Chrome flex bug workaround.
this
.
content
.
parentElement
.
style
.
display
=
''
;
}
// Suppress events, otherwise superfluous CSN gets set
// immediately after the message, causing rate-limiting issues.
...
...
webpack.html
View file @
d17ae811
...
...
@@ -25,6 +25,7 @@
enable_smacks
:
true
,
i18n
:
'
en
'
,
message_archiving
:
'
always
'
,
persistent_store
:
'
IndexedDB
'
,
muc_domain
:
'
conference.chat.example.org
'
,
muc_respect_autojoin
:
true
,
view_mode
:
'
overlayed
'
,
...
...
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