Commit a412bd92 authored by JC Brand's avatar JC Brand

Merge branch 'MUC-toggle-Call' of https://github.com/thierrytiti/converse.js...

Merge branch 'MUC-toggle-Call' of https://github.com/thierrytiti/converse.js into thierrytiti-MUC-toggle-Call
parents 97ebcb33 0745cdea
......@@ -2469,6 +2469,7 @@
'click .toggle-smiley': 'toggleEmoticonMenu',
'click .toggle-smiley ul li': 'insertEmoticon',
'click .toggle-clear': 'clearChatRoomMessages',
'click .toggle-call': 'toggleCall',
'click .toggle-participants a': 'toggleOccupants',
'keypress textarea.chat-textarea': 'keyPressed',
'mousedown .dragresize-tm': 'onDragResizeStart'
......@@ -2538,7 +2539,7 @@
this.toggleOccupants();
return this;
},
toggleOccupants: function (ev) {
if (ev) {
ev.preventDefault();
......
......@@ -18,6 +18,8 @@ Changelog
* Add offline pretty status to enable translation [thierrytiti]
* Add Ping funcionnality and Pong Handler (Fix to issue #144) [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)
------------------
......
......@@ -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.
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('Bare buddy JID is', data.model.get('jid'));
// ... Third-party library code ...
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment