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
3e9994e0
Commit
3e9994e0
authored
Feb 07, 2015
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Websocket support. closes #204
parent
95bc55c1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
converse.js
converse.js
+8
-8
docs/CHANGES.rst
docs/CHANGES.rst
+1
-0
No files found.
converse.js
View file @
3e9994e0
...
...
@@ -280,6 +280,7 @@
'
clear
'
:
true
,
'
toggle_participants
'
:
true
},
websocket_url
:
undefined
,
xhr_custom_status
:
false
,
xhr_custom_status_url
:
''
,
xhr_user_search
:
false
,
...
...
@@ -664,11 +665,6 @@
// object should never be exposed to production systems.
// 'jasmine tests' is an invalid http bind service value,
// so we're sure that this is just for tests.
//
// TODO: We might need to consider websockets, which
// probably won't use the 'service' attr. Current
// strophe.js version used by converse.js doesn't support
// websockets.
this
.
callback
(
this
);
}
else
{
this
.
callback
();
...
...
@@ -5101,10 +5097,14 @@
//
// Also, what do we do when the keepalive session values are
// expired? Do we try to fall back?
if
(
!
this
.
bosh_service_url
)
{
throw
(
"
Error: you must supply a value for the bosh_service_url
"
);
if
(
!
this
.
bosh_service_url
&&
!
this
.
websocket_url
)
{
throw
(
"
Error: you must supply a value for the bosh_service_url or websocket_url
"
);
}
if
(
'
WebSocket
'
in
window
||
'
MozWebSocket
'
in
window
)
{
this
.
connection
=
new
Strophe
.
Connection
(
this
.
websocket_url
);
}
else
{
this
.
connection
=
new
Strophe
.
Connection
(
this
.
bosh_service_url
);
}
this
.
connection
=
new
Strophe
.
Connection
(
this
.
bosh_service_url
);
this
.
setUpXMLLogging
();
if
(
this
.
prebind
)
{
...
...
docs/CHANGES.rst
View file @
3e9994e0
...
...
@@ -8,6 +8,7 @@ Changelog
* Updated Afrikaans translations. [jcbrand]
* Add responsiveness to CSS. We now use Sass preprocessor for generating CSS. [jcbrand]
* Don't send out the message carbons IQ stanza on each page load. [jcbrand]
* #204 Support websocket connections. [jcbrand]
* #252, 253 Add fullname and jid to contact's tooltip in roster. [gbonvehi]
* #292 Better support for XEP-0085 Chat State Notifications. [jcbrand]
* #295 Document "allow_registration". [gbonvehi]
...
...
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