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

Add _converse.default_connection_options

Browse Source 
So that we can specify defaults
This commit is contained in:
JC Brand 2019-05-30 11:14:56 +02:00
parent eafe995f95
commit 7c7002ebf9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/headless/converse-core.js
View File

@ -190,6 +190,7 @@ _converse.CHATROOMS_TYPE = 'chatroom';
_converse.HEADLINES_TYPE = 'headline'; _converse.HEADLINES_TYPE = 'headline';
_converse.CONTROLBOX_TYPE = 'controlbox'; _converse.CONTROLBOX_TYPE = 'controlbox';
_converse.default_connection_options = {};
// Default configuration values // Default configuration values
// ---------------------------- // ----------------------------
@ -412,11 +413,14 @@ _converse.initConnection = function () {
throw new Error("initConnection: you must supply a value for either the bosh_service_url or websocket_url or both."); throw new Error("initConnection: you must supply a value for either the bosh_service_url or websocket_url or both.");
} }
if (('WebSocket' in window || 'MozWebSocket' in window) && _converse.websocket_url) { if (('WebSocket' in window || 'MozWebSocket' in window) && _converse.websocket_url) {
_converse.connection = new Strophe.Connection(_converse.websocket_url, _converse.connection_options); _converse.connection = new Strophe.Connection(
_converse.websocket_url,
Object.assign(_converse.default_connection_options, _converse.connection_options)
);
} else if (_converse.bosh_service_url) { } else if (_converse.bosh_service_url) {
_converse.connection = new Strophe.Connection( _converse.connection = new Strophe.Connection(
_converse.bosh_service_url, _converse.bosh_service_url,
_.assignIn(_converse.connection_options, {'keepalive': _converse.keepalive}) Object.assign(_converse.default_connection_options, _converse.connection_options, {'keepalive': _converse.keepalive})
); );
} else { } else {
throw new Error("initConnection: this browser does not support websockets and bosh_service_url wasn't specified."); throw new Error("initConnection: this browser does not support websockets and bosh_service_url wasn't specified.");