LAB-linuxserver/core
1
0
Fork 0
mirror of https://github.com/linuxserver/core.git synced 2026-02-20 05:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:c9/newclient into feature/scm

Browse Source
This commit is contained in:
Ruben Daniels 2015-11-20 19:52:10 +00:00
commit 4e5f32395e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -69,7 +69,7 @@ plugins/c9.account.*/node_modules/
test/selenium/notify/
test/selenium/results/
testresults
cfresult
*cfresult*
.c9revisions
.settings

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.455",
"version": "3.1.470",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",

2
plugins/c9.core/http-xhr.js
View File

@ -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);
}