diff --git a/.gitignore b/.gitignore index fa5a6480..2700de4a 100644 --- a/.gitignore +++ b/.gitignore @@ -69,7 +69,7 @@ plugins/c9.account.*/node_modules/ test/selenium/notify/ test/selenium/results/ testresults -cfresult +*cfresult* .c9revisions .settings diff --git a/package.json b/package.json index 4b2f0bb2..cf0672c6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.455", + "version": "3.1.470", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", diff --git a/plugins/c9.core/http-xhr.js b/plugins/c9.core/http-xhr.js index 4f81302f..8f34ba46 100644 --- a/plugins/c9.core/http-xhr.js +++ b/plugins/c9.core/http-xhr.js @@ -88,7 +88,7 @@ define(function(require, module, exports) { xhr.abort(); var err = new Error("Timeout"); err.code = "ETIMEOUT"; - err.data = {url: url, query: options.query}; + err.data = {url: url, query: options.query, timeout: timeout}; done(err); }, timeout); }