0.14.0

balderdashy · Oct 5, 2016 · 17b797f · 17b797f
1 parent 6e1f349
commit 17b797f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sails.io.js-dist",
-  "version": "0.13.8",
+  "version": "0.14.0",
   "description": "Distribution version of sails.io.js for browsers, including bundled socket.io-client",
   "main": "sails.io.js",
   "repository": {

diff --git a/dist/sails.io.js b/dist/sails.io.js
@@ -135,7 +135,7 @@ pong:3,message:4,upgrade:5,noop:6},s=i(r),t={type:"error",data:"parser error"},u
    * @type {Dictionary}
    */
   var SDK_INFO = {
-    version: '0.13.8', // <-- pulled automatically from package.json, do not change!
+    version: '0.14.0', // <-- pulled automatically from package.json, do not change!
     language: 'javascript',
     platform: (function (){
       if (typeof module === 'object' && typeof module.exports !== 'undefined') {
@@ -1469,8 +1469,15 @@ pong:3,message:4,upgrade:5,noop:6},s=i(r),t={type:"error",data:"parser error"},u
     // If configured to do so, start auto-connecting after the first cycle of the event loop
     // has completed (to allow time for this behavior to be configured/disabled
     // by specifying properties on `io.sails`)
+
+    // Indicate that the autoConnect timer has started.
+    io.socket.mightBeAboutToAutoConnect = true;
+
     setTimeout(function() {
 
+      // Indicate that the autoConect timer fired.
+      io.socket.mightBeAboutToAutoConnect = false;
+
       // If autoConnect is disabled, delete the eager socket (io.socket) and bail out.
       if (io.sails.autoConnect === false || io.sails.autoconnect === false) {
         delete io.socket;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sails.io.js",
-  "version": "0.13.8",
+  "version": "0.14.0",
   "description": "Javascript SDK for communicating w/ a Sails server via WebSockets/socket.io.",
   "main": "sails.io.js",
   "directories": {

diff --git a/sails.io.js b/sails.io.js
@@ -118,7 +118,7 @@
    * @type {Dictionary}
    */
   var SDK_INFO = {
-    version: '0.13.8', // <-- pulled automatically from package.json, do not change!
+    version: '0.14.0', // <-- pulled automatically from package.json, do not change!
     language: 'javascript',
     platform: (function (){
       if (typeof module === 'object' && typeof module.exports !== 'undefined') {