Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated the CHANGELOG.

  • Loading branch information...
commit 3210c8c646e562f757f2c5bd3e0b10458cb40f4a 1 parent a7c85bf
@tiagoalves tiagoalves authored
Showing with 4 additions and 3 deletions.
  1. +3 −1 CHANGELOG.md
  2. +1 −2  lib/dist-browser.js
View
4 CHANGELOG.md
@@ -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
View
3  lib/dist-browser.js
@@ -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,
Please sign in to comment.
Something went wrong with that request. Please try again.