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

Merge branch 'master' of github.com:c9/newclient into fix/deps

pull/223/head
Ruben Daniels 2015-10-20 18:37:39 -07:00
rodzic e8719844b2 e3b2897dcf
commit 7d6f09a41e
7 zmienionych plików z 64 dodań i 49 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
bin/c9
Wyświetl plik

@ -6,8 +6,6 @@ var architect = require("architect");
// Add ability to load AMD modules
require("amd-loader");
var verbose = process.argv.indexOf("--verbose") + 1
|| process.argv.indexOf("-v") + 1;
architect.resolveConfig(require("../configs/cli.js")(),
__dirname + "/../plugins", function (err, config) {

14
configs/cli.js
Wyświetl plik

@ -1,12 +1,14 @@
module.exports = function(options) {
// workaround for api difference between node and c9 events modules
var EventEmitter = require("events").EventEmitter;
var emit_ = EventEmitter.prototype.emit
EventEmitter.prototype.emit = function() {
emit_.apply(this, arguments);
return true;
}
var EventEmitter = require("../plugins/c9.nodeapi/events").EventEmitter;
var Module = require("module");
var _resolveFilename_orig = Module._resolveFilename
Module._resolveFilename = function(id, parent) {
if (id == "events" && parent && /c9.core[\\/]ext\.js/.test(parent.id))
id = "../c9.nodeapi/events";
return _resolveFilename_orig.call(Module, id, parent);
};
var PID = process.env.C9_PID || 526;
var APIHOST = process.env.C9_APIHOST || "api.c9.io"; // "api.c9.io";

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

@ -705,6 +705,20 @@ module.exports = function(options) {
staticPrefix: staticPrefix + "/plugins/c9.ide.collab/notifications"
},
// Test
"plugins/c9.ide.test/test",
"plugins/c9.ide.test/testpanel",
"plugins/c9.ide.test/testrunner",
{
packagePath: "plugins/c9.ide.test/all",
staticPrefix: staticPrefix + "/plugins/c9.ide.test"
},
"plugins/c9.ide.test/results",
"plugins/c9.ide.test/coverage",
"plugins/c9.ide.test/coverageview",
"plugins/c9.ide.test.mocha/mocha",
// git integration
"plugins/c9.ide.scm/scm",
"plugins/c9.ide.scm/scmpanel",
@ -715,24 +729,6 @@ module.exports = function(options) {
"plugins/c9.ide.scm/mergetool"
];
if (!options.sdk) {
plugins.push(
// Test
"plugins/c9.ide.test/test",
"plugins/c9.ide.test/testpanel",
"plugins/c9.ide.test/testrunner",
{
packagePath: "plugins/c9.ide.test/all",
staticPrefix: staticPrefix + "/plugins/c9.ide.test"
},
"plugins/c9.ide.test/results",
"plugins/c9.ide.test/coverage",
"plugins/c9.ide.test/coverageview",
"plugins/c9.ide.test.mocha/mocha"
);
}
if (packaging || !devel) {
plugins.push({

35
node_modules/vfs-local/localfs.js wygenerowano vendored
Wyświetl plik

@ -350,7 +350,7 @@ module.exports = function setup(fsOptions) {
// This helper function doesn't follow node conventions in the callback,
// there is no err, only entry.
function createStatEntry(file, fullpath, callback) {
function createStatEntry(file, fullpath, callback, _loop) {
fs.lstat(fullpath, function (err, stat) {
var entry = {
name: file
@ -378,26 +378,29 @@ module.exports = function setup(fsOptions) {
return callback(entry);
}
fs.readlink(fullpath, function (err, link) {
if (entry.name == link) {
entry.linkStatErr = "ELOOP: recursive symlink";
return callback(entry);
}
if (err) {
entry.linkErr = err.stack;
return callback(entry);
}
var fullLinkPath = pathResolve(dirname(fullpath), link);
if (!_loop) {
_loop = {fullLinkPath: fullpath, max: 100};
}
if (fullLinkPath.toLowerCase() == _loop.fullLinkPath.toLowerCase() || _loop.max --< 0) {
entry.linkErr = "ELOOP: recursive symlink";
return callback(entry);
}
entry.link = link;
resolvePath(pathResolve(dirname(fullpath), link), {alreadyRooted: true}, function (err, newpath) {
if (err) {
entry.linkStatErr = err;
return callback(entry);
}
createStatEntry(basename(newpath), newpath, function (linkStat) {
entry.linkStat = linkStat;
linkStat.fullPath = newpath.substr(base.length) || "/";
return callback(entry);
});
resolvePath(fullLinkPath, {alreadyRooted: true}, function (err, newpath) {
if (err) {
entry.linkErr = err;
return callback(entry);
}
createStatEntry(basename(newpath), newpath, function (linkStat) {
entry.linkStat = linkStat;
linkStat.fullPath = newpath.substr(base.length) || "/";
return callback(entry);
}, _loop);
});
});
}

6
package.json
Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.51",
"version": "3.1.54",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",
@ -26,7 +26,7 @@
"mkdirp": "~0.3.5",
"msgpack-js": "~0.1.1",
"msgpack-js-browser": "~0.1.4",
"nak": "",
"nak": "git://github.com/cloud9ide/nak.git#719f2188ec1d8e4ce553286e80737d7e6434d777",
"netutil": "~0.0.2",
"optimist": "~0.6.0",
"qs": "0.6.6",
@ -109,7 +109,7 @@
"c9.ide.scm": "#d92bb9aeb5",
"c9.ide.terminal.monitor": "#b76f1c9f24",
"c9.ide.test": "#302388c9eb",
"c9.ide.test.mocha": "#55d85ae95e",
"c9.ide.test.mocha": "#f6cc482886",
"c9.ide.theme.flat": "#2de8414db7",
"c9.ide.threewaymerge": "#229382aa0b",
"c9.ide.undo": "#b028bcb4d5",

20
plugins/c9.cli.publish/publish.js
Wyświetl plik

@ -44,6 +44,7 @@ define(function(require, exports, module) {
var force = false;
var dryRun = false;
var createTag = false;
var compress = false;
// Set up basic auth for api if needed
if (BASICAUTH) api.basicAuth = BASICAUTH;
@ -85,6 +86,11 @@ define(function(require, exports, module) {
"alias": "t",
"default": false,
"boolean": true
},
"compress" : {
"description": "Minify output with uglify.js",
"default": true,
"boolean": true
}
},
check: function(argv) {
@ -125,9 +131,17 @@ define(function(require, exports, module) {
"alias": "d",
"default": false,
"boolean": true
},
"compress" : {
"description": "Minify output with uglify.js",
"default": false,
"boolean": true
}
},
exec: function(argv) {
compress = argv["compress"];
verbose = argv["verbose"];
force = argv["force"];
if (argv["devel"]) {
var code = function(argument) {
/* TODO explain */
@ -159,13 +173,14 @@ define(function(require, exports, module) {
}
else {
dryRun = true;
publish({local: true}, function(err){
publish({local: true}, function(err, result){
if (err) {
console.error(err);
if (!verbose)
console.error("\nTry running with --verbose flag for more information");
process.exit(1);
}
console.log("Done!");
});
}
}
@ -186,6 +201,7 @@ define(function(require, exports, module) {
check: function(argv) {},
exec: function(argv) {
verbose = argv["verbose"];
compress = argv["compress"];
unpublish(
function(err, data){
@ -574,7 +590,7 @@ define(function(require, exports, module) {
enableBrowser: true,
includeConfig: false,
noArchitect: true,
compress: !dryRun,
compress: compress,
obfuscate: true,
oneLine: true,
filter: [],

4
plugins/c9.fs/fs.cache.xml.js
Wyświetl plik

@ -561,8 +561,8 @@ define(function(require, exports, module) {
node.size = stat.size;
if (stat.mtime != undefined)
node.mtime = stat.mtime;
if (original_stat)
node.link = stat.fullPath;
if (original_stat || stat.linkErr)
node.link = stat.fullPath || stat.linkErr;
node.isFolder = isFolder;
}