Merge pull request +14400 from c9/ide-sdk-prs

merge sdk prs
pull/295/merge
Harutyun Amirjanyan 2016-06-24 12:09:11 +04:00 zatwierdzone przez GitHub
commit e68151fbee
4 zmienionych plików z 6 dodań i 3 usunięć

Wyświetl plik

@ -100,12 +100,12 @@ module.exports = function(config, optimist) {
console.log("and suppress this message.\n"); console.log("and suppress this message.\n");
host = config.host = "127.0.0.1"; host = config.host = "127.0.0.1";
} }
if (/:/.test(argv.auth) && !isLocalhost && !process.env.C9_HOSTNAME) { var auth = (argv.auth + "").split(":");
if (!auth[1] && !isLocalhost && !process.env.C9_HOSTNAME) {
console.log("Warning: running Cloud9 without using HTTP authentication."); console.log("Warning: running Cloud9 without using HTTP authentication.");
console.log("Run using --listen localhost instead to only expose Cloud9 to localhost,"); console.log("Run using --listen localhost instead to only expose Cloud9 to localhost,");
console.log("or use -a username:password to setup HTTP authentication\n"); console.log("or use -a username:password to setup HTTP authentication\n");
} }
var auth = (argv.auth + "").split(":");
var plugins = [ var plugins = [
{ {

Wyświetl plik

@ -76,7 +76,7 @@
"c9.ide.find": "#a2dfc3e306", "c9.ide.find": "#a2dfc3e306",
"c9.ide.find.infiles": "#488db22ee1", "c9.ide.find.infiles": "#488db22ee1",
"c9.ide.find.replace": "#47a84af707", "c9.ide.find.replace": "#47a84af707",
"c9.ide.run.debug": "#08249419c5", "c9.ide.run.debug": "#8ae86ca02f",
"c9.automate": "#47e2c429c9", "c9.automate": "#47e2c429c9",
"c9.ide.ace.emmet": "#6dc4585e02", "c9.ide.ace.emmet": "#6dc4585e02",
"c9.ide.ace.gotoline": "#d33220b1e0", "c9.ide.ace.gotoline": "#d33220b1e0",

Wyświetl plik

@ -385,6 +385,7 @@ define(function(require, module, exports) {
open({ open({
path: name, path: name,
focus: true,
active: true, active: true,
pane: e.pane, pane: e.pane,
value: "", value: "",

Wyświetl plik

@ -155,4 +155,6 @@ function readWin32Settings() {
if (!fs.existsSync(path.join(process.env.HOME, ".c9", "msys/bin/bash.exe"))) if (!fs.existsSync(path.join(process.env.HOME, ".c9", "msys/bin/bash.exe")))
console.error(e); console.error(e);
} }
process.env.CHERE_INVOKING = 1; // prevent cygwin from changing bash path
} }