diff --git a/plugins/c9.vfs.standalone/standalone.js b/plugins/c9.vfs.standalone/standalone.js index 5f68fa57..2f9dc859 100644 --- a/plugins/c9.vfs.standalone/standalone.js +++ b/plugins/c9.vfs.standalone/standalone.js @@ -94,6 +94,11 @@ function plugin(options, imports, register) { source: "query", optional: true }, + settings: { + type: "number", + source: "query", + optional: true + }, } }, function(req, res, next) { @@ -116,11 +121,18 @@ function plugin(options, imports, register) { }); opts.options.debug = req.params.debug !== undefined; + var workspaceSettings = getSettings(configName, options); + res.setHeader("Cache-Control", "no-cache, no-store"); + + if (req.params.settings == 1) + return res.json(workspaceSettings); + if (req.params.config == 1) - return res.json(getConfig(configName, opts)); + return res.json(getConfig(configName, workspaceSettings)); + res.render(__dirname + "/views/standalone.html.ejs", { - architectConfig: getConfig(configName, opts), + architectConfig: getConfig(configName, workspaceSettings), configName: configName, packed: opts.packed, standalone: true, @@ -326,9 +338,7 @@ function getConfigName(requested, options) { return name; } -function getConfig(configName, options) { - var filename = __dirname + "/../../configs/client-" + configName + ".js"; - +function getSettings(configName, options) { var installPath = options.settingDir || options.installPath || ""; var workspaceDir = options.options.workspaceDir; var settings = { @@ -347,6 +357,14 @@ function getConfig(configName, options) { settings[type] = data; } options.options.settings = settings; - - return require(filename)(options.options); + options.options.configName = configName; + options.options.manifest = { + version: options.options.manifest.version + }; + return options.options; +} + +function getConfig(configName, options) { + var filename = __dirname + "/../../configs/client-" + configName + ".js"; + return require(filename)(options); } diff --git a/plugins/c9.vfs.standalone/www/ide.html b/plugins/c9.vfs.standalone/www/ide.html index d5299556..dece83eb 100644 --- a/plugins/c9.vfs.standalone/www/ide.html +++ b/plugins/c9.vfs.standalone/www/ide.html @@ -23,6 +23,7 @@