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
36f63d90
Commit
36f63d90
authored
6 years ago
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #1272 Hiding MUC occupants leaves a blank space
parent
20098c08
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
12 deletions
+32
-12
CHANGES.md
CHANGES.md
+1
-0
css/converse.css
css/converse.css
+2
-5
dist/converse.js
dist/converse.js
+17
-3
sass/_chatrooms.scss
sass/_chatrooms.scss
+0
-1
src/converse-muc-views.js
src/converse-muc-views.js
+10
-2
src/templates/toolbar.html
src/templates/toolbar.html
+2
-1
No files found.
CHANGES.md
View file @
36f63d90
...
...
@@ -7,6 +7,7 @@
-
#1257 Prefer 'probably' over 'maybe' when evaluating audio play support.
-
#1261 File upload not working
-
#1252 Correctly reflect the state in bookmark icon title.
-
#1272 Hiding MUC occupants leaves a blank space
## 4.0.3 (2018-10-22)
...
...
This diff is collapsed.
Click to expand it.
css/converse.css
View file @
36f63d90
...
...
@@ -10699,9 +10699,6 @@ body.reset {
#conversejs
.converse-fullscreen
.chatroom
.box-flyout
.chatroom-body
.chat-area
.chat-content
,
#conversejs
.converse-mobile
.chatroom
.box-flyout
.chatroom-body
.chat-area
.chat-content
{
border-top-left-radius
:
4px
;
}
#conversejs
.converse-fullscreen
.chatroom
.box-flyout
.chatroom-body
.chat-area.full
,
#conversejs
.converse-mobile
.chatroom
.box-flyout
.chatroom-body
.chat-area.full
{
max-width
:
100%
;
}
#conversejs
.converse-fullscreen
.chatroom
.box-flyout
.chatroom-body
.chat-area.full
.new-msgs-indicator
,
#conversejs
.converse-mobile
.chatroom
.box-flyout
.chatroom-body
.chat-area.full
.new-msgs-indicator
{
max-width
:
100%
;
}
...
...
This diff is collapsed.
Click to expand it.
dist/converse.js
View file @
36f63d90
...
...
@@ -63440,13 +63440,21 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
if (this.model.get('hidden_occupants')) {
u.removeClass('fa-angle-double-right', icon_el);
u.addClass('fa-angle-double-left', icon_el);
u.addClass('full', this.el.querySelector('.chat-area'));
const chat_area = this.el.querySelector('.chat-area');
u.removeClass('col-md-9', chat_area);
u.removeClass('col-8', chat_area);
u.addClass('full', chat_area);
u.addClass('col-12', chat_area);
u.hideElement(this.el.querySelector('.occupants'));
} else {
const chat_area = this.el.querySelector('.chat-area');
u.addClass('fa-angle-double-right', icon_el);
u.removeClass('fa-angle-double-left', icon_el);
u.removeClass('full', this.el.querySelector('.chat-area'));
u.removeClass('hidden', this.el.querySelector('.occupants'));
u.removeClass('full', chat_area);
u.removeClass('col-12', chat_area);
u.addClass('col-md-9', chat_area);
u.addClass('col-8', chat_area);
}
this.occupantsview.setOccupantsHeight();
...
...
@@ -103495,7 +103503,13 @@ __e(o.label_start_call) +
} ;
__p += '\n';
if (o.show_occupants_toggle) { ;
__p += '\n<li class="toggle-occupants fa fa-angle-double-right" title="' +
__p += '\n<li class="toggle-occupants fa ';
if (o.hidden_occupants) { ;
__p += ' fa-angle-double-left ';
} else { ;
__p += ' fa-angle-double-right ';
} ;
__p += '"\n title="' +
__e(o.label_hide_occupants) +
'"></li>\n';
} ;
This diff is collapsed.
Click to expand it.
sass/_chatrooms.scss
View file @
36f63d90
...
...
@@ -406,7 +406,6 @@
border-top-left-radius
:
$chatbox-border-radius
;
}
&
.full
{
max-width
:
100%
;
.new-msgs-indicator
{
max-width
:
100%
;
}
...
...
This diff is collapsed.
Click to expand it.
src/converse-muc-views.js
View file @
36f63d90
...
...
@@ -735,13 +735,21 @@ converse.plugins.add('converse-muc-views', {
if
(
this
.
model
.
get
(
'
hidden_occupants
'
))
{
u
.
removeClass
(
'
fa-angle-double-right
'
,
icon_el
);
u
.
addClass
(
'
fa-angle-double-left
'
,
icon_el
);
u
.
addClass
(
'
full
'
,
this
.
el
.
querySelector
(
'
.chat-area
'
));
const
chat_area
=
this
.
el
.
querySelector
(
'
.chat-area
'
);
u
.
removeClass
(
'
col-md-9
'
,
chat_area
);
u
.
removeClass
(
'
col-8
'
,
chat_area
);
u
.
addClass
(
'
full
'
,
chat_area
);
u
.
addClass
(
'
col-12
'
,
chat_area
);
u
.
hideElement
(
this
.
el
.
querySelector
(
'
.occupants
'
));
}
else
{
const
chat_area
=
this
.
el
.
querySelector
(
'
.chat-area
'
);
u
.
addClass
(
'
fa-angle-double-right
'
,
icon_el
);
u
.
removeClass
(
'
fa-angle-double-left
'
,
icon_el
);
u
.
removeClass
(
'
full
'
,
this
.
el
.
querySelector
(
'
.chat-area
'
));
u
.
removeClass
(
'
hidden
'
,
this
.
el
.
querySelector
(
'
.occupants
'
));
u
.
removeClass
(
'
full
'
,
chat_area
);
u
.
removeClass
(
'
col-12
'
,
chat_area
);
u
.
addClass
(
'
col-md-9
'
,
chat_area
);
u
.
addClass
(
'
col-8
'
,
chat_area
);
}
this
.
occupantsview
.
setOccupantsHeight
();
},
...
...
This diff is collapsed.
Click to expand it.
src/templates/toolbar.html
View file @
36f63d90
...
...
@@ -8,5 +8,6 @@
<li
class=
"toggle-call fa fa-phone"
title=
"{{{o.label_start_call}}}"
></li>
{[ } ]}
{[ if (o.show_occupants_toggle) { ]}
<li
class=
"toggle-occupants fa fa-angle-double-right"
title=
"{{{o.label_hide_occupants}}}"
></li>
<li
class=
"toggle-occupants fa {[ if (o.hidden_occupants) { ]} fa-angle-double-left {[ } else { ]} fa-angle-double-right {[ } ]}"
title=
"{{{o.label_hide_occupants}}}"
></li>
{[ } ]}
This diff is collapsed.
Click to expand it.
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