Skip to content

Commit

Permalink
Updated the CHANGELOG.
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagoalves committed Oct 4, 2013
1 parent a7c85bf commit 3210c8c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Expand Up @@ -2,8 +2,10 @@

2013-10-02: Version 0.3.5

* Experimental: Added support for SSL in the browser (HTTPS) and in Node.js (WSS)
* Experimental: Added support for SSL in the browser (HTTPS) and in Node.js (WSS).
* Implemented the `activityTerminated` event for participants.
* Implemented a way to manually trigger the `ready` protocol message.
* Added a way to `.quit()` activities and participations.
* Added reconnection attempts for port 2080 if port 80 fails.

2013-07-05: Version 0.3.4
Expand Down
3 changes: 1 addition & 2 deletions lib/dist-browser.js
Expand Up @@ -4,19 +4,18 @@ var errors = require('./utils/error-browser.js');

var defaultOptions = {
socket: SockJS,
// Leave empty to use '//' so that the browser can choose between http and https
endPointHost:'geoplatform.muzzley.com',
endPointPath: 'web'
};

var getConnectionOptions = function(opts) {
// http or https?
var secure = (opts && typeof opts.secure !== undefined) ? opts.secure : false;
var manualReady = (opts && typeof opts.manualReady !== undefined) ? opts.manualReady : false;
if (window && window.location && window.location.protocol === 'https:') {
// If we're in a browser and we're loaded through HTTPS
secure = true;
}
var secure = (opts && typeof opts.secure !== undefined) ? opts.secure : false;

var connectionOptions = {
socket: (opts && opts.connection && opts.connection.socket) ? opts.connection.socket : defaultOptions.socket,
Expand Down

0 comments on commit 3210c8c

Please sign in to comment.