Merge remote-tracking branch 'origin/master' into clone-workspaces

Conflicts:
	plugins/c9.api.project/resize.js
	plugins/c9.api.project/routes.js

.gitignore

@@ -3,6 +3,7 @@ build/sdk
 build/win32*
 build/node.exe
 build/node*.zip
+build/c9bin
 build/Cloud9-dev.app
 docs/generate/lib/node_modules
 plugins/c9.ide.layout.classic/less/*.css

configs/standalone.js

@@ -144,6 +144,7 @@ module.exports = function(config, optimist) {
                 "c9.vfs.client": true,
                 "c9.cli.bridge": true,
                 "c9.nodeapi": true,
+                "c9.ide.experiment": true,
                 "saucelabs.preview": true
             }
         },
@@ -174,6 +175,7 @@ module.exports = function(config, optimist) {
         "./c9.vfs.server/filelist",
         "./c9.vfs.server/statics",
         "./c9.metrics/mock_metrics",
+        "./c9.ide.experiment/mock_experiment",
         {
             packagePath: "./c9.vfs.server/vfs.connect.standalone",
             workspaceDir: baseProc,

node_modules/ace/lib/ace/lib/event.js

@@ -244,7 +244,7 @@ function normalizeCommandKeys(callback, e, keyCode) {
                 if (pressedKeys[keyCode] == 1)
                     ts = e.timeStamp;
             } else if (keyCode === 18 && hashId === 3 && location === 2) {
-                var dt = e.timestamp - ts;
+                var dt = e.timeStamp - ts;
                 if (dt < 50)
                     pressedKeys.altGr = true;
             }

node_modules/architect-build/npm_build.js

@@ -199,19 +199,21 @@ dest = "/build/webkitbuilds/app.nw"
 var args = ["local","-s", "local"];
 */
 module.exports = function(options, cb) {
-    var dest = convertPath(options.dest);
+    var dest = options.dest && convertPath(options.dest);
     var root = convertPath(options.root);
     var args = options.args;
     ignore = options.ignore && function(id) {
         return options.ignore.test(id);
     };
     build(root, args, function(err, result) {
-        var serverSource = fs.readFileSync(root + "/server.js", "utf8");
-        serverSource = serverSource.replace(/^(#.*|"use strict";?|\s)*/, function(a) {
-            return a.trim() + "\n\n" + patchTemplate + "\n\n";
-        });
-        fs.writeFileSync(dest + "/server.js", serverSource, "utf8");
-        fs.writeFileSync(dest + "/module-map.json", JSON.stringify(result.moduleMap), "utf8");
+        if (dest) {
+            var serverSource = fs.readFileSync(root + "/server.js", "utf8");
+            serverSource = serverSource.replace(/^(#.*|"use strict";?|\s)*/, function(a) {
+                return a.trim() + "\n\n" + patchTemplate + "\n\n";
+            });
+            fs.writeFileSync(dest + "/server.js", serverSource, "utf8");
+            fs.writeFileSync(dest + "/module-map.json", JSON.stringify(result.moduleMap), "utf8");
+        }
         
         cb(null, result);
     });

package.json

@@ -13,7 +13,7 @@
         "acorn": ">=0.11.0",
         "async": "^0.9.0",
         "base64id": "~0.1.0",
-        "c9": "0.1.0",
+        "c9": "",
         "connect": "~2.12.0",
         "debug": "~0.7.4",
         "ejs": "~0.8.3",
@@ -82,7 +82,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#4cd918ed36",
+        "c9.ide.installer": "#4c25b26f70",
         "c9.ide.mount": "#32e79866ee",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",

server.js

@@ -54,6 +54,7 @@ function main(argv, config, callback) {
         .default("settings", DEFAULT_SETTINGS)
         .describe("settings", "Settings file to use")
         .describe("dump", "dump config file as JSON")
+        .describe("domain", "Top-level domain to use (e.g, c9.io)")
         .boolean("help")
         .describe("help", "Show command line options.");
 
@@ -86,6 +87,14 @@ function start(configName, options, callback) {
    
     var settings = require(path.join(__dirname, "./settings", settingsName))();
     
+    if (argv.domain) {
+        settings.c9.domain = argv.domain;
+        for (var s in settings) {
+            settings[s].baseUrl = settings[s].baseUrl
+                && settings[s].baseUrl.replace(/[^./]+\.[^.]+$/, argv.domain);
+        }
+    }
+
     var plugins = require(configPath)(settings, options);
     
     if (argv.help) {