From e64153b83f226438b06574180da5428a37aec79e Mon Sep 17 00:00:00 2001 From: JC Brand Date: Wed, 3 Sep 2014 20:04:32 +0200 Subject: [PATCH] Implement the participants show/hide feature. --- converse.js | 30 ++++++++++++++++++++++++++++-- src/templates/toolbar.html | 7 +++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/converse.js b/converse.js index 052702543..55f73f322 100644 --- a/converse.js +++ b/converse.js @@ -218,7 +218,8 @@ this.visible_toolbar_buttons = { 'emoticons': true, 'call': false, - 'clear': true + 'clear': true, + 'toggle-participants': true }; this.xhr_custom_status = false; this.xhr_custom_status_url = ''; @@ -1006,6 +1007,26 @@ this.scrollDown(); }, + toggleParticipants: function (ev) { + if (ev) { + ev.preventDefault(); + ev.stopPropagation(); + } + var $el = $(ev.target); + if ($el.hasClass("icon-hide-users")) { + $el.removeClass('icon-hide-users').addClass('icon-show-users'); + this.$('div.participants').animate({width: 0}).hide(); + this.$('.chat-area').animate({width: '100%'}); + this.$('form.sendXMPPMessage').animate({width: '100%'}); + } else { + $el.removeClass('icon-show-users').addClass('icon-hide-users'); + this.$('.chat-area').animate({width: '200px'}, $.proxy(function () { + this.$('div.participants').css({width: '100px'}).show(); + }, this)); + this.$('form.sendXMPPMessage').animate({width: '200px'}); + } + }, + clearChatRoomMessages: function (ev) { ev.stopPropagation(); var result = confirm(__("Are you sure you want to clear the messages from this room?")); @@ -1447,8 +1468,11 @@ UNVERIFIED: UNVERIFIED, VERIFIED: VERIFIED, allow_otr: converse.allow_otr && !this.is_chatroom, + label_clear: __('Clear all messages'), label_end_encrypted_conversation: __('End encrypted conversation'), + label_hide_participants: __('Hide the list of participants'), label_refresh_encrypted_conversation: __('Refresh encrypted conversation'), + label_start_call: __('Start a call'), label_start_encrypted_conversation: __('Start encrypted conversation'), label_verify_with_fingerprints: __('Verify with fingerprints'), label_verify_with_smp: __('Verify with SMP'), @@ -1457,7 +1481,8 @@ otr_translated_status: OTR_TRANSLATED_MAPPING[data.otr_status], show_call_button: converse.visible_toolbar_buttons.call, show_clear_button: converse.visible_toolbar_buttons.clear, - show_emoticons: converse.visible_toolbar_buttons.emoticons + show_emoticons: converse.visible_toolbar_buttons.emoticons, + show_participants_toggle: this.is_chatroom && converse.visible_toolbar_buttons['toggle-participants'] }) ) ); @@ -1948,6 +1973,7 @@ 'click .toggle-smiley': 'toggleEmoticonMenu', 'click .toggle-smiley ul li': 'insertEmoticon', 'click .toggle-clear': 'clearChatRoomMessages', + 'click .toggle-participants a': 'toggleParticipants', 'keypress textarea.chat-textarea': 'keyPressed', 'mousedown .dragresize-tm': 'onDragResizeStart' }, diff --git a/src/templates/toolbar.html b/src/templates/toolbar.html index 28026f4ba..c1d21ef2c 100644 --- a/src/templates/toolbar.html +++ b/src/templates/toolbar.html @@ -18,10 +18,13 @@ {[ } ]} {[ if (show_call_button) { ]} -
  • +
  • +{[ } ]} +{[ if (show_participants_toggle) { ]} +
  • {[ } ]} {[ if (show_clear_button) { ]} -
  • +
  • {[ } ]} {[ if (allow_otr) { ]}