Merge pull request +9625 from c9/fix/various

Restore client-config_test for local version
pull/199/head
Lennart Kats 2015-09-29 11:08:25 +02:00
commit ca725b343f
2 zmienionych plików z 2 dodań i 16 usunięć

Wyświetl plik

@ -1,6 +1,7 @@
var join = require("path").join; var join = require("path").join;
module.exports = function(options) { module.exports = function(options) {
options.collab = false;
var config = require("./client-default")(options); var config = require("./client-default")(options);
return module.exports.makeLocal(config, options); return module.exports.makeLocal(config, options);
}; };
@ -132,20 +133,6 @@ module.exports.makeLocal = function(config, options) {
"plugins/c9.ide.newresource/open": true, "plugins/c9.ide.newresource/open": true,
"plugins/c9.ide.info/info": true, "plugins/c9.ide.info/info": true,
// "plugins/c9.ide.login/login": true, // "plugins/c9.ide.login/login": true,
"plugins/c9.ide.collab/connect": true,
"plugins/c9.ide.collab/collab": true,
"plugins/c9.ide.collab/collabpanel": true,
"plugins/c9.ide.collab/workspace": true,
"plugins/c9.ide.collab/util": true,
"plugins/c9.ide.collab/ot/document": true,
"plugins/c9.ide.collab/cursor_layer": true,
"plugins/c9.ide.collab/author_layer": true,
"plugins/c9.ide.collab/timeslider/timeslider": true,
"plugins/c9.ide.notifications/notifications": true,
"plugins/c9.ide.collab/members/members_panel": true,
"plugins/c9.ide.collab/share/share": true,
"plugins/c9.ide.collab/members/members": true,
"plugins/c9.ide.collab/chat/chat": true,
"plugins/c9.ide.feedback/nps": true, "plugins/c9.ide.feedback/nps": true,
"plugins/c9.ide.download/download": true "plugins/c9.ide.download/download": true
}; };

Wyświetl plik

@ -218,7 +218,6 @@ module.exports = function(options) {
nak: options.nakBin || "~/.c9/node_modules/nak/bin/nak", nak: options.nakBin || "~/.c9/node_modules/nak/bin/nak",
node: options.nodeBin, node: options.nodeBin,
local: options.local, local: options.local,
installPath: options.installPath
}, },
{ {
packagePath: "plugins/c9.ide.find.infiles/findinfiles", packagePath: "plugins/c9.ide.find.infiles/findinfiles",
@ -277,7 +276,7 @@ module.exports = function(options) {
// VFS // VFS
"plugins/c9.fs/proc", "plugins/c9.fs/proc",
"plugins/c9.fs/proc.apigen", "plugins/c9.fs/proc.apigen", // used only by disabled deploy plugins
"plugins/c9.fs/net", "plugins/c9.fs/net",
{ {
packagePath: "plugins/c9.fs/fs", packagePath: "plugins/c9.fs/fs",