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
7481fab0
Commit
7481fab0
authored
May 29, 2015
by
JC Brand
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'thierrytiti-MUC-toggle-Call'
parents
97ebcb33
a412bd92
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
converse.js
converse.js
+2
-1
docs/CHANGES.rst
docs/CHANGES.rst
+2
-0
docs/source/configuration.rst
docs/source/configuration.rst
+1
-1
No files found.
converse.js
View file @
7481fab0
...
@@ -2469,6 +2469,7 @@
...
@@ -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 @@
...
@@ -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
();
...
...
docs/CHANGES.rst
View file @
7481fab0
...
@@ -18,6 +18,8 @@ Changelog
...
@@ -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)
------------------
------------------
...
...
docs/source/configuration.rst
View file @
7481fab0
...
@@ -560,7 +560,7 @@ Allows you to show or hide buttons on the chat boxes' toolbars.
...
@@ -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 ...
...
...
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