Merge remote-tracking branch 'origin/master' into vfs-upgrade-engineio

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2607",
+    "version": "3.1.2636",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -58,7 +58,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#79bcb2fe06",
+        "c9.ide.language": "#b8f73a9da1",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#3949510863",
         "c9.ide.language.html": "#22fdc74869",
@@ -68,7 +68,7 @@
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#64ab01f271",
         "c9.ide.language.javascript.infer": "#69fbc134d6",
-        "c9.ide.language.jsonalyzer": "#d8183d84b4",
+        "c9.ide.language.jsonalyzer": "#2b1878b731",
         "c9.ide.language.codeintel": "#fc867feec4",
         "c9.ide.collab": "#cfbf987438",
         "c9.ide.local": "#10eb45842a",
@@ -94,9 +94,9 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#76c8e3213a",
         "c9.ide.installer": "#b2e4ba0a92",
-        "c9.ide.language.python": "#aff0772c78",
+        "c9.ide.language.python": "#15e7ff9a3f",
         "c9.ide.language.go": "#6ce1c7a7ef",
-        "c9.ide.mount": "#6ddfd05db3",
+        "c9.ide.mount": "#3001a633f2",
         "c9.ide.navigate": "#5d5707058c",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#2ae85a9e33",

plugins/c9.vfs.client/vfs.ping.js

@@ -9,6 +9,7 @@ define(function(require, exports, module) {
         var Plugin = imports.Plugin;
         var c9 = imports.c9;
         var ext = imports.ext;
+        var vfs = imports.vfs;
 
         /***** Initialization *****/
 
@@ -61,6 +62,9 @@ define(function(require, exports, module) {
             }
 
             if (!api) return callback(new Error("Client is offline"));
+            
+            if (!vfs.isIdle())
+                return vfs.connection.once("message", ping.bind(null, callback));
 
             var start = Date.now();
             api.ping("serverTime", function(err, response) {

plugins/c9.vfs.client/vfs_client.js

@@ -330,6 +330,13 @@ define(function(require, exports, module) {
                 bufferedVfsCalls.push([method, path, options, callback]);
         }
         
+        function isIdle() {
+            if (!connection || !consumer)
+                return false;
+            return !Object.keys(connection.unacked).length &&
+                !Object.keys(consumer.callbacks || {}).length;
+        }
+        
         /***** Lifecycle *****/
         
         plugin.on("load", function(){
@@ -430,7 +437,9 @@ define(function(require, exports, module) {
             // Extending the API
             use: vfsCall.bind(null, "use"),
             extend: vfsCall.bind(null, "extend"),
-            unextend: vfsCall.bind(null, "unextend")
+            unextend: vfsCall.bind(null, "unextend"),
+            
+            isIdle: isIdle,
         });
         
         register(null, {