Merge pull request +8433 from c9/lk

Minor random fixes/improvements
pull/117/merge
Harutyun Amirjanyan 2015-07-27 17:46:46 +03:00
commit 8f10297225
2 zmienionych plików z 8 dodań i 3 usunięć

9
node_modules/vfs-child/parent.js wygenerowano vendored
Wyświetl plik

@ -23,17 +23,22 @@ function Parent(fsOptions) {
// Override Consumer's connect since the transport logic is internal to this module
this.connect = connect.bind(this);
function connect(callback) {
child = spawn(nodeBin[0], args, options);
try {
child = spawn(nodeBin[0], args, options).on("error", tryNext);
}
catch (e) {
return tryNext(e);
}
child.stdin.readable = true;
Consumer.prototype.connect.call(this, [child.stdout, child.stdin], tryNext);
child.on("exit", disconnect);
child.on("error", tryNext);
child.stdin.resume();
var _self = this;
// try all possible locations of node before giving up
function tryNext(err, vfs) {
if (!child) return;
child.removeListener("error", tryNext);
child.on("error", function ignore() {});
if (err && err.code == "ENOENT" && nodeBin.length > 1) {
child = null;
nodeBin.shift();

Wyświetl plik

@ -71,7 +71,7 @@
"c9.ide.find": "#6cc6d3379d",
"c9.ide.find.infiles": "#72582de3cd",
"c9.ide.find.replace": "#44772dd796",
"c9.ide.run.debug": "#c7f1ed5d5d",
"c9.ide.run.debug": "#0f244ecdfc",
"c9.automate": "#47e2c429c9",
"c9.ide.ace.emmet": "#6dc4585e02",
"c9.ide.ace.gotoline": "#a8ff07c8f4",