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

Merge branch 'thierrytiti-MUC-toggle-Call'

Browse Source
This commit is contained in:
JC Brand 2015-05-29 10:12:52 +02:00
commit 7481fab034
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
converse.js
View File

@ -2469,6 +2469,7 @@
'click .toggle-smiley': 'toggleEmoticonMenu', 'click .toggle-smiley': 'toggleEmoticonMenu',
'click .toggle-smiley ul li': 'insertEmoticon', 'click .toggle-smiley ul li': 'insertEmoticon',
'click .toggle-clear': 'clearChatRoomMessages', 'click .toggle-clear': 'clearChatRoomMessages',
'click .toggle-call': 'toggleCall',
'click .toggle-participants a': 'toggleOccupants', 'click .toggle-participants a': 'toggleOccupants',
'keypress textarea.chat-textarea': 'keyPressed', 'keypress textarea.chat-textarea': 'keyPressed',
'mousedown .dragresize-tm': 'onDragResizeStart' 'mousedown .dragresize-tm': 'onDragResizeStart'
@ -2538,7 +2539,7 @@
this.toggleOccupants(); this.toggleOccupants();
return this; return this;
}, },
toggleOccupants: function (ev) { toggleOccupants: function (ev) {
if (ev) { if (ev) {
ev.preventDefault(); ev.preventDefault();

2
docs/CHANGES.rst
View File

@ -18,6 +18,8 @@ Changelog
* Add offline pretty status to enable translation [thierrytiti] * Add offline pretty status to enable translation [thierrytiti]
* Add Ping funcionnality and Pong Handler (Fix to issue #144) [thierrytiti] * Add Ping funcionnality and Pong Handler (Fix to issue #144) [thierrytiti]
* Add automatic Away mode and XEP-0352 support [thierrytiti] * Add automatic Away mode and XEP-0352 support [thierrytiti]
* MUC: missing toggle Call handler and function [thierrytiti]
* Updated documentation about call [thierrytiti]
0.9.3 (2015-05-01) 0.9.3 (2015-05-01)
------------------ ------------------

2
docs/source/configuration.rst
View File

@ -560,7 +560,7 @@ Allows you to show or hide buttons on the chat boxes' toolbars.
Provides a button with a picture of a telephone on it. Provides a button with a picture of a telephone on it.
When the call button is pressed, it will emit an event that can be used by a third-party library to initiate a call.:: When the call button is pressed, it will emit an event that can be used by a third-party library to initiate a call.::
converse.on('callButtonClicked', function(event, data) { converse.listen.on('callButtonClicked', function(event, data) {
console.log('Strophe connection is', data.connection); console.log('Strophe connection is', data.connection);
console.log('Bare buddy JID is', data.model.get('jid')); console.log('Bare buddy JID is', data.model.get('jid'));
// ... Third-party library code ... // ... Third-party library code ...