mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge remote-tracking branch 'origin/master' into ide-remove-agpl-2

pull/313/head
Lennart Kats 2016-06-03 09:30:18 +00:00
rodzic 6e0c8a0c22 2a9592bd3b
commit c87c0ff83a
4 zmienionych plików z 14 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
configs/client-default.js
Wyświetl plik

@ -113,7 +113,8 @@ module.exports = function(options) {
debug: debug, debug: debug,
installPath: options.installPath, installPath: options.installPath,
dashboardUrl: options.dashboardUrl, dashboardUrl: options.dashboardUrl,
accountUrl: options.accountUrl accountUrl: options.accountUrl,
rejectUnauthorized: options.rejectUnauthorized
}, },
{ {
packagePath: "plugins/c9.vfs.client/endpoint", packagePath: "plugins/c9.vfs.client/endpoint",

4
node_modules/kaefer/package.json wygenerowano vendored
Wyświetl plik

@ -8,8 +8,8 @@
"email": "fabian@c9.io" "email": "fabian@c9.io"
}], }],
"dependencies": { "dependencies": {
"engine.io": "~1.5.1", "engine.io": "~1.6.9",
"engine.io-client": "~1.5.1", "engine.io-client": "~1.6.9",
"amd-loader": "*" "amd-loader": "*"
}, },
"devDependencies": { "devDependencies": {

8
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{ {
"name": "c9", "name": "c9",
"description": "New Cloud9 Client", "description": "New Cloud9 Client",
"version": "3.1.2623", "version": "3.1.2642",
"author": "Ajax.org B.V. <info@ajax.org>", "author": "Ajax.org B.V. <info@ajax.org>",
"private": true, "private": true,
"main": "bin/c9", "main": "bin/c9",
@ -17,8 +17,8 @@
"debug": "~0.7.4", "debug": "~0.7.4",
"ejs": "~1.0.0", "ejs": "~1.0.0",
"emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad", "emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad",
"engine.io": "1.5.3", "engine.io": "1.6.9",
"engine.io-client": "1.5.3", "engine.io-client": "1.6.9",
"jsonm": "1.0.6", "jsonm": "1.0.6",
"http-error": "~0.0.5", "http-error": "~0.0.5",
"less": "^2.4.0", "less": "^2.4.0",
@ -97,7 +97,7 @@
"c9.ide.installer": "#b2e4ba0a92", "c9.ide.installer": "#b2e4ba0a92",
"c9.ide.language.python": "#15e7ff9a3f", "c9.ide.language.python": "#15e7ff9a3f",
"c9.ide.language.go": "#6ce1c7a7ef", "c9.ide.language.go": "#6ce1c7a7ef",
"c9.ide.mount": "#6ddfd05db3", "c9.ide.mount": "#3001a633f2",
"c9.ide.navigate": "#5d5707058c", "c9.ide.navigate": "#5d5707058c",
"c9.ide.newresource": "#981a408a7b", "c9.ide.newresource": "#981a408a7b",
"c9.ide.openfiles": "#2ae85a9e33", "c9.ide.openfiles": "#2ae85a9e33",

9
plugins/c9.vfs.client/vfs_client.js
Wyświetl plik

@ -240,9 +240,10 @@ define(function(require, exports, module) {
path: parsedSocket.path, path: parsedSocket.path,
host: parsedSocket.host, host: parsedSocket.host,
port: parsedSocket.port port: parsedSocket.port
|| parsedSocket.protocol == "https:" ? "443" : null, || (parsedSocket.protocol == "https:" ? "443" : null),
secure: parsedSocket.protocol secure: parsedSocket.protocol
? parsedSocket.protocol == "https:" : true ? parsedSocket.protocol == "https:" : true,
rejectUnauthorized: options.rejectUnauthorized
}; };
callback(); callback();
}); });
@ -330,8 +331,10 @@ define(function(require, exports, module) {
} }
function isIdle() { function isIdle() {
if (!connection || !consumer)
return false;
return !Object.keys(connection.unacked).length && return !Object.keys(connection.unacked).length &&
consumer && !Object.keys(consumer.callbacks || {}).length; !Object.keys(consumer.callbacks || {}).length;
} }
/***** Lifecycle *****/ /***** Lifecycle *****/