Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Two fixes related to occupants toggling

Browse Source 
* Empty chat area doesn't resize when hiding occupants.
* Properly change icon when toggling occupants
This commit is contained in:
JC Brand 2016-06-10 15:05:49 +00:00
parent 854633089d
commit 380a60aebd
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/converse.css
View File

@ -2004,9 +2004,9 @@
#conversejs .chatroom .box-flyout .chatroom-body .chat-area .chat-content { #conversejs .chatroom .box-flyout .chatroom-body .chat-area .chat-content {
padding: 0 0.5em 0 0.5em; } padding: 0 0.5em 0 0.5em; }
#conversejs .chatroom .box-flyout .chatroom-body .chat-area.full { #conversejs .chatroom .box-flyout .chatroom-body .chat-area.full {
max-width: 100%; } min-width: 100%; }
#conversejs .chatroom .box-flyout .chatroom-body .chat-area.full .new-msgs-indicator { #conversejs .chatroom .box-flyout .chatroom-body .chat-area.full .new-msgs-indicator {
max-width: 100%; } min-width: 100%; }
#conversejs .chatroom .box-flyout .chatroom-body .mentioned { #conversejs .chatroom .box-flyout .chatroom-body .mentioned {
font-weight: bold; } font-weight: bold; }
#conversejs .chatroom .box-flyout .chatroom-body .chat-msg-room { #conversejs .chatroom .box-flyout .chatroom-body .chat-msg-room {

4
sass/_chatrooms.scss
View File

@ -59,9 +59,9 @@
padding: 0 0.5em 0 0.5em; padding: 0 0.5em 0 0.5em;
} }
&.full { &.full {
max-width: 100%; min-width: 100%;
.new-msgs-indicator { .new-msgs-indicator {
max-width: 100%; min-width: 100%;
} }
} }
} }

5
src/converse-muc.js
View File

@ -263,16 +263,15 @@
// Bit of a hack, to make sure that the sidebar's state doesn't change // Bit of a hack, to make sure that the sidebar's state doesn't change
this.model.set({hidden_occupants: !this.model.get('hidden_occupants')}); this.model.set({hidden_occupants: !this.model.get('hidden_occupants')});
} }
var $el = this.$('.icon-hide-users');
if (!this.model.get('hidden_occupants')) { if (!this.model.get('hidden_occupants')) {
this.model.save({hidden_occupants: true}); this.model.save({hidden_occupants: true});
$el.removeClass('icon-hide-users').addClass('icon-show-users'); this.$('.icon-hide-users').removeClass('icon-hide-users').addClass('icon-show-users');
this.$('.occupants').addClass('hidden'); this.$('.occupants').addClass('hidden');
this.$('.chat-area').addClass('full'); this.$('.chat-area').addClass('full');
this.scrollDown(); this.scrollDown();
} else { } else {
this.model.save({hidden_occupants: false}); this.model.save({hidden_occupants: false});
$el.removeClass('icon-show-users').addClass('icon-hide-users'); this.$('.icon-show-users').removeClass('icon-show-users').addClass('icon-hide-users');
this.$('.chat-area').removeClass('full'); this.$('.chat-area').removeClass('full');
this.$('div.occupants').removeClass('hidden'); this.$('div.occupants').removeClass('hidden');
this.scrollDown(); this.scrollDown();