diff --git a/CHANGELOG.md b/CHANGELOG.md index b67021f7..3dea6539 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## v1.0.3 + +### Various changes + +* Using converseJS ^7.0.4 +* Updating documentation + ## v1.0.2 ### Bug fixes diff --git a/README.md b/README.md index c67e4375..bc391a4f 100644 --- a/README.md +++ b/README.md @@ -108,19 +108,16 @@ You can use the builtin ConverseJS implementation. #### Custom ConverseJS webchat -If you want to setup your own webchat with converseJS, here is some tips. +If you want to setup your own webchat with converseJS on a different webserver, here is some tips. Once you have a XMPP server that allow anonymous authentication, with bosh (or websocket) enabled, you can - for example - setup a html page that looks like [this one](documentation/examples/converseJS/index.html). You have of course to -replace the path /conversejs/7.0.3 with your converseJS path, and replace your_domain +replace the path /conversejs/dist with your converseJS path, and replace your_domain by your actual domain. -NB : there is a bug in the converseJS 7.0.4 release. The dist files don't work. -So if you are not building converseJS yourself, use version 7.0.3 instead. - -NB: for converseJS to find your server configuration (bosh, websocket, ...), -you have to add a file [/.well-known/host-meta](documentation/examples/converseJS/host-meta). +NB: converseJS has an option «discover_connection_methods» to find your server configuration (bosh, websocket, ...). +To use it, you have to add a file [/.well-known/host-meta](documentation/examples/converseJS/host-meta). Please refer to the converseJS documentation. ### XMPP Server: Prosody diff --git a/conversejs/builtin.js b/conversejs/builtin.js index be7b9cf3..e4147a86 100644 --- a/conversejs/builtin.js +++ b/conversejs/builtin.js @@ -21,7 +21,7 @@ window.initConverse = function initConverse ({ auto_join_rooms: [ room ], - discover_connection_methods: true, + discover_connection_methods: false, // this parameter seems buggy with converseJS 7.0.4 bosh_service_url: boshServiceUrl === '' ? undefined : boshServiceUrl, websocket_url: websocketServiceUrl === '' ? undefined : websocketServiceUrl, jid: jid, diff --git a/documentation/examples/converseJS/index.html b/documentation/examples/converseJS/index.html index a62650a4..4a44b444 100644 --- a/documentation/examples/converseJS/index.html +++ b/documentation/examples/converseJS/index.html @@ -5,8 +5,8 @@ - - + +