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
5e97db95
Commit
5e97db95
authored
May 30, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a close button on the occupants sidebar
parent
8c983ab2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
8 deletions
+41
-8
css/converse.css
css/converse.css
+12
-4
sass/_chatrooms.scss
sass/_chatrooms.scss
+11
-3
src/converse-muc-views.js
src/converse-muc-views.js
+14
-0
src/templates/chatroom_sidebar.html
src/templates/chatroom_sidebar.html
+4
-1
No files found.
css/converse.css
View file @
5e97db95
...
...
@@ -8494,10 +8494,18 @@ body.reset {
border-left
:
1px
solid
#666
;
border-bottom-right-radius
:
4px
;
padding
:
0.5em
;
}
#conversejs
.converse-embedded
.chatroom
.box-flyout
.chatroom-body
.occupants
.occupants-heading
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
.occupants-heading
{
font-family
:
"Century Gothic"
,
futura
,
"URW Gothic L"
,
Verdana
,
sans-serif
;
padding
:
0.3em
0
;
}
#conversejs
.converse-embedded
.chatroom
.box-flyout
.chatroom-body
.occupants
.occupants-header
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
.occupants-header
{
display
:
flex
;
flex-direction
:
column
;
}
#conversejs
.converse-embedded
.chatroom
.box-flyout
.chatroom-body
.occupants
.occupants-header
.hide-occupants
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
.occupants-header
.hide-occupants
{
align-self
:
flex-end
;
cursor
:
pointer
;
}
#conversejs
.converse-embedded
.chatroom
.box-flyout
.chatroom-body
.occupants
.occupants-header
.occupants-heading
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
.occupants-header
.occupants-heading
{
font-family
:
"Century Gothic"
,
futura
,
"URW Gothic L"
,
Verdana
,
sans-serif
;
padding
:
0.3em
0
;
}
#conversejs
.converse-embedded
.chatroom
.box-flyout
.chatroom-body
.occupants
.chatroom-features
,
#conversejs
.chatroom
.box-flyout
.chatroom-body
.occupants
.chatroom-features
{
width
:
100%
;
}
...
...
sass/_chatrooms.scss
View file @
5e97db95
...
...
@@ -120,9 +120,17 @@
border-bottom-right-radius
:
$chatbox-border-radius
;
padding
:
0
.5em
;
.occupants-heading
{
font-family
:
$heading-font
;
padding
:
0
.3em
0
;
.occupants-header
{
display
:
flex
;
flex-direction
:
column
;
.hide-occupants
{
align-self
:
flex-end
;
cursor
:
pointer
;
}
.occupants-heading
{
font-family
:
$heading-font
;
padding
:
0
.3em
0
;
}
}
.chatroom-features
{
...
...
src/converse-muc-views.js
View file @
5e97db95
...
...
@@ -499,6 +499,7 @@
'
click .send-button
'
:
'
onFormSubmitted
'
,
'
click .toggle-call
'
:
'
toggleCall
'
,
'
click .toggle-occupants
'
:
'
toggleOccupants
'
,
'
click .hide-occupants
'
:
'
hideOccupants
'
,
'
click .toggle-smiley ul.emoji-picker li
'
:
'
insertEmoji
'
,
'
click .toggle-smiley
'
:
'
toggleEmojiMenu
'
,
'
click .upload-file
'
:
'
toggleFileUpload
'
,
...
...
@@ -710,6 +711,19 @@
this
.
occupantsview
.
setOccupantsHeight
();
},
hideOccupants
(
ev
,
preserve_state
)
{
/* Show or hide the right sidebar containing the chat
* occupants (and the invite widget).
*/
if
(
ev
)
{
ev
.
preventDefault
();
ev
.
stopPropagation
();
}
this
.
model
.
save
({
'
hidden_occupants
'
:
true
});
this
.
setOccupantsVisibility
();
this
.
scrollDown
();
},
toggleOccupants
(
ev
,
preserve_state
)
{
/* Show or hide the right sidebar containing the chat
* occupants (and the invite widget).
...
...
src/templates/chatroom_sidebar.html
View file @
5e97db95
<!-- <div class="occupants"> -->
<p
class=
"occupants-heading"
>
{{{o.label_occupants}}}
</p>
<div
class=
"occupants-header"
>
<i
class=
"hide-occupants fa fa-times"
></i>
<p
class=
"occupants-heading"
>
{{{o.label_occupants}}}
</p>
</div>
<ul
class=
"occupant-list"
></ul>
<div
class=
"chatroom-features"
></div>
<!-- </div> -->
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