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

fix windows path handling issues

pull/327/head
nightwing 2016-06-28 23:00:44 +04:00
rodzic 91f98d3aee
commit 30129604cc
5 zmienionych plików z 14 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
package.json
Wyświetl plik

@ -109,7 +109,7 @@
"c9.ide.recentfiles": "#7c099abf40", "c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#301d2ab519", "c9.ide.remote": "#301d2ab519",
"c9.ide.processlist": "#2b12cd1bdd", "c9.ide.processlist": "#2b12cd1bdd",
"c9.ide.run": "#d661a7b847", "c9.ide.run": "#20a43e01e4",
"c9.ide.run.build": "#0598fff697", "c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#054367574c", "c9.ide.run.debug.xdebug": "#054367574c",
"c9.ide.save": "#25a63f31e2", "c9.ide.save": "#25a63f31e2",

4
plugins/c9.core/c9.js
Wyświetl plik

@ -122,9 +122,9 @@ define(function(require, module, exports) {
emit("quit"); emit("quit");
} }
function toExternalPath(path) { function toExternalPath(path, sep) {
if (plugin.platform == "win32") if (plugin.platform == "win32")
path = path.replace(/^[/]+/, "").replace(/[/]+/g, "\\"); path = path.replace(/^[/]+/, "").replace(/[/]+/g, sep || "\\");
return path; return path;
} }

11
plugins/c9.core/util.js
Wyświetl plik

@ -208,20 +208,21 @@ define(function(require, exports, module) {
var reHome, reWorkspace, homeSub; var reHome, reWorkspace, homeSub;
plugin.$initPaths = function(home, workspaceDir) { plugin.$initPaths = function(home, workspaceDir) {
reHome = new RegExp("^" + plugin.escapeRegExp(home) + "(/|/?$)"); var pre = c9.platform == "win32" ? "/?" : "";
reHome = new RegExp("^" + pre + plugin.escapeRegExp(home) + "(/|/?$)");
var wd = workspaceDir.replace(/\/?$/, ""); var wd = workspaceDir.replace(/\/?$/, "");
reWorkspace = new RegExp("^" + plugin.escapeRegExp(wd) + "(/|/?$)"); reWorkspace = new RegExp("^" + pre + plugin.escapeRegExp(wd) + "(/|/?$)");
homeSub = "~/"; homeSub = "~/";
if (home == workspaceDir) { if (home == workspaceDir) {
reHome = new RegExp("^(" + plugin.escapeRegExp(home) + "|~)(/|/?$)"); reHome = new RegExp("^(" + pre + plugin.escapeRegExp(home) + "|~)(/|/?$)");
homeSub = "/"; homeSub = "/";
reWorkspace = null; reWorkspace = null;
} else if (reHome.test(workspaceDir)) { } else if (reHome.test(workspaceDir)) {
reWorkspace = new RegExp("^" + reWorkspace = new RegExp("^" + pre +
plugin.escapeRegExp(workspaceDir.replace(reHome, "~/")) + "(/|/?$)" plugin.escapeRegExp(workspaceDir.replace(reHome, "~/")) + "(/|/?$)"
); );
} else if (reWorkspace.test(home)) { } else if (reWorkspace.test(home)) {
reHome = new RegExp("^(" + plugin.escapeRegExp(home) + "|~)(/|/?$)"); reHome = new RegExp("^(" + pre + plugin.escapeRegExp(home) + "|~)(/|/?$)");
homeSub = home.replace(reWorkspace, "/").replace(/\/?$/, "/"); homeSub = home.replace(reWorkspace, "/").replace(/\/?$/, "/");
reWorkspace = null; reWorkspace = null;
} }

3
plugins/c9.ide.terminal/link_handler.js
Wyświetl plik

@ -205,8 +205,7 @@ define(function(require, exports, module) {
} }
// Make sure home dir is marked correctly // Make sure home dir is marked correctly
path = path.replace(reHome, "~"); path = util.normalizePath(path);
if (path[0] != "/") path = "/" + path;
fs.stat(path, function(err, stat) { fs.stat(path, function(err, stat) {
if (err) { if (err) {

8
plugins/c9.vfs.standalone/standalone.js
Wyświetl plik

@ -149,16 +149,16 @@ function plugin(options, imports, register) {
return next(); return next();
res.writeHead(200, {"Content-Type": "application/javascript"}); res.writeHead(200, {"Content-Type": "application/javascript"});
res.end("define(function(require, exports, module) { return '" res.end("define(function(require, exports, module) { return "
+ options.workspaceDir + "'; });"); + JSON.stringify(options.workspaceDir.replace(/\\/g, "/")) + "; });");
}); });
api.get("/vfs-home", function(req, res, next) { api.get("/vfs-home", function(req, res, next) {
if (!options.options.testing) if (!options.options.testing)
return next(); return next();
res.writeHead(200, {"Content-Type": "application/javascript"}); res.writeHead(200, {"Content-Type": "application/javascript"});
res.end("define(function(require, exports, module) { return '" res.end("define(function(require, exports, module) { return "
+ process.env.HOME + "'; });"); + JSON.stringify(process.env.HOME.replace(/\\/g, "/")) + "; });");
}); });
api.get("/update", function(req, res, next) { api.get("/update", function(req, res, next) {