kopia lustrzana https://github.com/c9/core
Merge branch 'fix/bridge' of github.com:c9/newclient into fix/bridge
commit
0160048fe4
|
@ -15,7 +15,7 @@ function Parent(fsOptions) {
|
||||||
options.uid = fsOptions.uid;
|
options.uid = fsOptions.uid;
|
||||||
delete fsOptions.uid;
|
delete fsOptions.uid;
|
||||||
}
|
}
|
||||||
options.customFds = [-1, -1, 2];
|
options.stdio = options.customFds = [-1, -1, 2];
|
||||||
var args = [require.resolve('./child.js'), JSON.stringify(fsOptions)];
|
var args = [require.resolve('./child.js'), JSON.stringify(fsOptions)];
|
||||||
var executablePath = process.execPath;
|
var executablePath = process.execPath;
|
||||||
var child;
|
var child;
|
||||||
|
|
|
@ -21,7 +21,9 @@ define(function(require, exports, module) {
|
||||||
// var emit = plugin.getEmitter();
|
// var emit = plugin.getEmitter();
|
||||||
|
|
||||||
var counter = 0;
|
var counter = 0;
|
||||||
var SOCKET = c9.home + "/.c9/bridge.socket";
|
var SOCKET = process.platform == "win32"
|
||||||
|
? "\\\\.\\pipe\\"+ process.env.HOME +"\\.c9\\bridge.socket"
|
||||||
|
: process.env.HOME + "/.c9/bridge.socket";
|
||||||
|
|
||||||
/***** Methods *****/
|
/***** Methods *****/
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,10 @@ module.exports = function (vfs, options, register) {
|
||||||
var net = require("net");
|
var net = require("net");
|
||||||
var Stream = require('stream');
|
var Stream = require('stream');
|
||||||
|
|
||||||
var SOCKET = process.env.HOME + "/.c9/bridge.socket";
|
var SOCKET = process.platform == "win32"
|
||||||
|
? "\\\\.\\pipe\\"+ process.env.HOME +"\\.c9\\bridge.socket"
|
||||||
|
: process.env.HOME + "/.c9/bridge.socket";
|
||||||
|
|
||||||
function createListenClient(api){
|
function createListenClient(api){
|
||||||
var client = net.connect(SOCKET, function(data){
|
var client = net.connect(SOCKET, function(data){
|
||||||
if (data) api.onData(data);
|
if (data) api.onData(data);
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
define(function(require, exports, module) {
|
define(function(require, exports, module) {
|
||||||
main.consumes = [
|
main.consumes = [
|
||||||
"Plugin", "bridge", "tabManager", "panels", "tree.favorites", "tree",
|
"Plugin", "bridge", "tabManager", "panels", "tree.favorites", "tree",
|
||||||
"fs", "preferences", "settings"
|
"fs", "preferences", "settings", "c9"
|
||||||
];
|
];
|
||||||
main.provides = ["bridge.commands"];
|
main.provides = ["bridge.commands"];
|
||||||
return main;
|
return main;
|
||||||
|
@ -16,6 +16,7 @@ define(function(require, exports, module) {
|
||||||
var settings = imports.settings;
|
var settings = imports.settings;
|
||||||
var favs = imports["tree.favorites"];
|
var favs = imports["tree.favorites"];
|
||||||
var fs = imports.fs;
|
var fs = imports.fs;
|
||||||
|
var c9 = imports.c9;
|
||||||
var prefs = imports.preferences;
|
var prefs = imports.preferences;
|
||||||
|
|
||||||
var async = require("async");
|
var async = require("async");
|
||||||
|
@ -68,11 +69,13 @@ define(function(require, exports, module) {
|
||||||
function open(message, callback) {
|
function open(message, callback) {
|
||||||
var i = -1;
|
var i = -1;
|
||||||
var tabs = [];
|
var tabs = [];
|
||||||
|
BASEPATH = c9.toInternalPath(BASEPATH);
|
||||||
|
|
||||||
async.each(message.paths, function(info, next) {
|
async.each(message.paths, function(info, next) {
|
||||||
var path = info.path;
|
var path = info.path;
|
||||||
i++;
|
i++;
|
||||||
|
|
||||||
|
path = c9.toInternalPath(path);
|
||||||
// Make sure file is inside workspace
|
// Make sure file is inside workspace
|
||||||
if (path.charAt(0) !== "~") {
|
if (path.charAt(0) !== "~") {
|
||||||
if (path.substr(0, BASEPATH.length) !== BASEPATH)
|
if (path.substr(0, BASEPATH.length) !== BASEPATH)
|
||||||
|
|
Ładowanie…
Reference in New Issue