From 4e98f9e1154208b5bfffeab5ce2abce32f3854d5 Mon Sep 17 00:00:00 2001 From: Mutahhir Date: Thu, 18 Feb 2016 11:23:51 +0000 Subject: [PATCH 001/476] Add better defaults to upsell dialog --- package.json | 4 +++- plugins/c9.ide.dialog.common/upsell.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5a5fc26b..a69f373f 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "c9.ide.language.javascript.tern": "#bf1072b11a", "c9.ide.language.javascript.infer": "#0561c69d67", "c9.ide.language.jsonalyzer": "#bf12af3d0a", + "c9.ide.language.codeintel": "#undefined", "c9.ide.collab": "#00bd850bba", "c9.ide.local": "#ded0db8949", "c9.ide.find": "#e33fbaed2f", @@ -117,6 +118,7 @@ "c9.ide.threewaymerge": "#229382aa0b", "c9.ide.undo": "#b028bcb4d5", "c9.ide.upload": "#0bd010d3dc", - "c9.ide.welcome": "#5b86c44e92" + "c9.ide.welcome": "#5b86c44e92", + "c9.ide.guide": "#undefined" } } \ No newline at end of file diff --git a/plugins/c9.ide.dialog.common/upsell.js b/plugins/c9.ide.dialog.common/upsell.js index 0200a9ba..2403ceff 100644 --- a/plugins/c9.ide.dialog.common/upsell.js +++ b/plugins/c9.ide.dialog.common/upsell.js @@ -33,8 +33,8 @@ define(function(require, module, exports) { var metadata = options.metadata; title = title || "This is a Premium feature"; - header = header || "Get Premium Support Now!"; - msg = msg || 'Help is just a few clicks away. Check out our amazing premium plans.' + header = header || "Upgrade to Premium Now!"; + msg = msg || 'A better, faster, more versatile Cloud9 is just a click away. Check out our amazing premium plans.' plugin.title = title; plugin.heading = options && options.isHTML ? header : util.escapeXml(header); From 4deeeb0f330e25fadf6753d12cea57e0cc470034 Mon Sep 17 00:00:00 2001 From: Mutahhir Date: Thu, 18 Feb 2016 11:24:24 +0000 Subject: [PATCH 002/476] Support menu to use upgrade plugin --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a69f373f..98d022a8 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "c9.ide.dialog.wizard": "#7667ec79a8", "c9.ide.fontawesome": "#781602c5d8", "c9.ide.format": "#5ec97fb083", - "c9.ide.help.support": "#af5c4055b2", + "c9.ide.help.support": "#706548f7ea", "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", From a7394f2d0d3cdac51625aa59e3a44e9a1f88b70e Mon Sep 17 00:00:00 2001 From: Mutahhir Date: Thu, 18 Feb 2016 12:19:28 +0000 Subject: [PATCH 003/476] Add doc comment and clean up dialog.upsell --- plugins/c9.ide.dialog.common/upsell.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/c9.ide.dialog.common/upsell.js b/plugins/c9.ide.dialog.common/upsell.js index 2403ceff..44277e37 100644 --- a/plugins/c9.ide.dialog.common/upsell.js +++ b/plugins/c9.ide.dialog.common/upsell.js @@ -27,9 +27,7 @@ define(function(require, module, exports) { options = {isHTML: true}; return plugin.queue(function(){ - var all = options.all; var cancel = options.cancel; - var showDontAsk = options.showDontAsk; var metadata = options.metadata; title = title || "This is a Premium feature"; @@ -73,7 +71,12 @@ define(function(require, module, exports) { plugin.freezePublicAPI({ /** - * + * @param {Function} onYes Callback for when user clicks the 'yes' button + * @param {Function} onNo Callback for when the user clicks the 'no' button + * @param {String} [title] Title for the dialog + * @param {String} [header] Header for the dialog body + * @param {String} [msg] Message to show the user. + * @param {Object} [options] Miscellaneous options */ show: show }); From f96f7dedc75915ad0d4dd49a8578ea8c8b0df460 Mon Sep 17 00:00:00 2001 From: Mutahhir Date: Thu, 18 Feb 2016 12:21:45 +0000 Subject: [PATCH 004/476] Use upgrade analytics support --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98d022a8..33d9df86 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "c9.ide.dialog.wizard": "#7667ec79a8", "c9.ide.fontawesome": "#781602c5d8", "c9.ide.format": "#5ec97fb083", - "c9.ide.help.support": "#706548f7ea", + "c9.ide.help.support": "#e46a619c93", "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", From 0e6ab89d2b62b8b65fbed55a0fd2a97fc7c7f0d5 Mon Sep 17 00:00:00 2001 From: Mutahhir Date: Mon, 22 Feb 2016 08:17:03 +0000 Subject: [PATCH 005/476] Move Support plugin from client-default -> client-default-hosted --- configs/client-default.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index d8cf7b69..dcac7def 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -717,12 +717,6 @@ module.exports = function(options) { packagePath: "plugins/c9.cli.bridge/bridge_commands", basePath: workspaceDir }, - { - packagePath: "plugins/c9.ide.help.support/support", - baseurl: options.ideBaseUrl, - userSnapApiKey: options.support.userSnapApiKey, - screenshotSupport: true - }, { packagePath: "plugins/c9.ide.help/help", staticPrefix: staticPrefix + "/plugins/c9.ide.help" From 352550f83123a9a0eb0ddaa45ec8603d40a96aa6 Mon Sep 17 00:00:00 2001 From: Mutahhir Date: Mon, 22 Feb 2016 08:17:24 +0000 Subject: [PATCH 006/476] Pass isHTML option for anchor tag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf27706c..5ddea6b5 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "c9.ide.dialog.wizard": "#7667ec79a8", "c9.ide.fontawesome": "#781602c5d8", "c9.ide.format": "#5ec97fb083", - "c9.ide.help.support": "#e46a619c93", + "c9.ide.help.support": "#932fbb3743", "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#19758abe08", "c9.ide.installer": "#0fde9f0067", From 51d92e051e03979fb1943fb1bca82e37d8374dcb Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 1 Mar 2016 12:40:09 +0000 Subject: [PATCH 007/476] Show additional hints on load --- package.json | 3 ++- plugins/c9.ide.server/views/flat-load-screen.html | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 3f48230f..a73f338a 100644 --- a/package.json +++ b/package.json @@ -117,6 +117,7 @@ "c9.ide.threewaymerge": "#229382aa0b", "c9.ide.undo": "#b028bcb4d5", "c9.ide.upload": "#0bd010d3dc", - "c9.ide.welcome": "#5b86c44e92" + "c9.ide.welcome": "#5b86c44e92", + "c9.ide.guide": "#undefined" } } \ No newline at end of file diff --git a/plugins/c9.ide.server/views/flat-load-screen.html b/plugins/c9.ide.server/views/flat-load-screen.html index b6c5c8c8..dc8e8a3a 100644 --- a/plugins/c9.ide.server/views/flat-load-screen.html +++ b/plugins/c9.ide.server/views/flat-load-screen.html @@ -43,7 +43,9 @@ "Press Option-Tab to go to the next IDE tab.", "Press Option-Shift-T to reopen a tab you closed.", "Press Option-T to open a new terminal at any time.", - "Press Cmd-E to search for a file by name." + "Press Cmd-E to search for a file by name.", + "Press Cmd-Shift-E to search for a function by name.", + "Press Option-S to switch between a terminal and an editor.", ]; var win_keybindings = [ @@ -54,7 +56,9 @@ "Press Ctrl-D to delete the current line of code", "Press Alt-Shift-T to reopen a tab you closed.", "Press Alt-T to open a new terminal at any time.", - "Press Ctrl-E to search for a file by name." + "Press Ctrl-E to search for a file by name.", + "Press Ctrl-Shift-E to search for a function by name.", + "Press Alt-S to switch between a terminal and an editor.", ]; var isMac = (navigator.platform == "MacIntel" || navigator.platform == "Macintosh" || navigator.platform == "MacPPC"); From 30df2c6cba8e6a151b3d7156bf3e84825bf48f1f Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 9 Mar 2016 22:36:19 +0400 Subject: [PATCH 008/476] fix c9 cli not working with npm 3 --- bin/c9 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/bin/c9 b/bin/c9 index 9de38075..6d325552 100755 --- a/bin/c9 +++ b/bin/c9 @@ -1,5 +1,23 @@ #!/usr/bin/env node +// workaround for npm 3 breaking bundled dependencies +if (Module.REPLACE_NODE_MODULE_PATH) { + var Module = require("module"); + var path = require("path") + var _resolveFilename_orig = Module._resolveFilename + Module._resolveFilename = function(id, parent) { + var root = path.join(__dirname, "/.."); + if (parent && parent.paths && parent.paths[0] && parent.paths[0].indexOf(root) == 0) { + parent.paths = parent.paths.map(function(p) { + if (p.indexOf(root) != 0) return + p = p.slice(root.length); + return root + p.replace(/([\\\/]|^)node_modules([\\\/]|$)/g, "$1n_m$2"); + }).filter(Boolean); + } + return _resolveFilename_orig.call(Module, id, parent); + }; +} + // Architect var architect = require("architect"); From 1d536ff6c49fabea9d4b907e4bbb17deb3df6e5f Mon Sep 17 00:00:00 2001 From: Shannon Duncan Date: Fri, 12 Feb 2016 19:09:59 +0000 Subject: [PATCH 009/476] added pipe command to c9.cli.open --- plugins/c9.cli.bridge/bridge_commands.js | 35 +++++++++++++++++++++++ plugins/c9.cli.open/open.js | 36 ++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/plugins/c9.cli.bridge/bridge_commands.js b/plugins/c9.cli.bridge/bridge_commands.js index 1952f719..8f202a93 100644 --- a/plugins/c9.cli.bridge/bridge_commands.js +++ b/plugins/c9.cli.bridge/bridge_commands.js @@ -36,6 +36,15 @@ define(function(require, exports, module) { case "open": open(message, e.respond); break; + case "pipe": + createPipe(message, e.respond); + break; + case "pipeData": + updatePipe(message, e.respond); + break; + case "pipeClosed": + closePipe(message, e.respond); + break; case "ping": e.respond(null, true); break; @@ -66,6 +75,32 @@ define(function(require, exports, module) { } /***** Methods *****/ + var pipeTab; + var pipeClosed = true; + + function createPipe(message, callback) { + if(pipeClosed) + { + tabManager.once("ready", function(){ + tabManager.open({focus:true, editorType: "ace"}, function(err, tab){ + pipeTab = tab; + pipeTab.document.value += ""; + pipeClosed = false; + }); + }); + } + + } + + function updatePipe(message, callback){ + console.log(message.data); + pipeTab.document.value += message.data.toString();; + } + + function closePipe(message, callback){ + pipeClosed = true; + } + function open(message, callback) { var i = -1; diff --git a/plugins/c9.cli.open/open.js b/plugins/c9.cli.open/open.js index d186f500..d7f7a271 100755 --- a/plugins/c9.cli.open/open.js +++ b/plugins/c9.cli.open/open.js @@ -11,6 +11,8 @@ define(function(require, exports, module) { var fs = require("fs"); var PATH = require("path"); + var StringDecoder = require('string_decoder').StringDecoder; + var decoder = new StringDecoder("utf8"); /***** Initialization *****/ @@ -25,19 +27,28 @@ define(function(require, exports, module) { cmd.addCommand({ name: "open", info: " Opens a file or directory.", - usage: "[--wait] ", + usage: "[--wait] [--pipe] [--stream] ", options: { "wait": { description: "Wait until the file(s) are closed", "default": false, "boolean": true + }, + "pipe": { + description: "Pipe data from a command into c9", + "default": false, + "boolean": true } }, check: function(argv) { - if (argv._.length < 2 && !argv["path"]) + if (argv._.length < 2 && !argv["path"] && !argv.pipe) throw new Error("Missing path"); }, exec: function(argv) { + if(argv.pipe) { + openWithPipe(function(){}); + return; + } open( argv._.slice(1), // Remove "open" from the paths argv.wait, @@ -49,6 +60,7 @@ define(function(require, exports, module) { /***** Methods *****/ function open(paths, wait, callback) { + try { paths = paths.map(function(path) { var isDir = fs.existsSync(path) && fs.statSync(path).isDirectory(); @@ -126,6 +138,26 @@ define(function(require, exports, module) { }); } + function openWithPipe(callback) { + var stdin = process.openStdin(); + var tab; + + bridge.send({ type: "pipe" }, function(){}); + + stdin.on("data", function(chunk){ + var textChunk = decoder.write(chunk); + bridge.send({ type: "pipeData", data: textChunk}, function(err, message) { + + }); + }); + + stdin.on("end", function(){ + bridge.send({ type: "pipeClosed"}, function(err, message) { + process.exit(40); + }); + }); + } + function startCloud9Local(opts, callback) { if (options.platform == "darwin") { proc.spawn("open", { From ef433b8948a5cd5c7f3e8b9f570731007de30f63 Mon Sep 17 00:00:00 2001 From: Shannon Duncan Date: Fri, 12 Feb 2016 21:43:08 +0000 Subject: [PATCH 010/476] cleaned up code, made better, ready for pull req; --- plugins/c9.cli.bridge/bridge_commands.js | 40 +++++++++-------------- plugins/c9.cli.open/open.js | 41 ++++++++++++++++-------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/plugins/c9.cli.bridge/bridge_commands.js b/plugins/c9.cli.bridge/bridge_commands.js index 8f202a93..1ec548ad 100644 --- a/plugins/c9.cli.bridge/bridge_commands.js +++ b/plugins/c9.cli.bridge/bridge_commands.js @@ -42,9 +42,6 @@ define(function(require, exports, module) { case "pipeData": updatePipe(message, e.respond); break; - case "pipeClosed": - closePipe(message, e.respond); - break; case "ping": e.respond(null, true); break; @@ -75,33 +72,26 @@ define(function(require, exports, module) { } /***** Methods *****/ - var pipeTab; - var pipeClosed = true; - function createPipe(message, callback) { - if(pipeClosed) - { - tabManager.once("ready", function(){ - tabManager.open({focus:true, editorType: "ace"}, function(err, tab){ - pipeTab = tab; - pipeTab.document.value += ""; - pipeClosed = false; - }); - }); - } - + tabManager.once("ready", function(){ + tabManager.open( { + focus: true, + editorType: "ace" + }, function(err, tab) { + if (err) + return callback(err); + callback(null, tab.name); + }); + }); } - function updatePipe(message, callback){ - console.log(message.data); - pipeTab.document.value += message.data.toString();; + function updatePipe(message, callback) { + tabManager.once("ready", function() { + tabManager.findTab(message.tab).document.value += message.data; + callback(null, true); + }); } - function closePipe(message, callback){ - pipeClosed = true; - } - - function open(message, callback) { var i = -1; var tabs = []; diff --git a/plugins/c9.cli.open/open.js b/plugins/c9.cli.open/open.js index d7f7a271..a89bb42a 100755 --- a/plugins/c9.cli.open/open.js +++ b/plugins/c9.cli.open/open.js @@ -139,21 +139,34 @@ define(function(require, exports, module) { } function openWithPipe(callback) { - var stdin = process.openStdin(); - var tab; - - bridge.send({ type: "pipe" }, function(){}); - - stdin.on("data", function(chunk){ - var textChunk = decoder.write(chunk); - bridge.send({ type: "pipeData", data: textChunk}, function(err, message) { - + bridge.send({ type: "pipe" }, function(err, response) { + if (err) { + console.log(err.message); + return; + } + + var stdin = process.openStdin(); + var finished = false; + stdin.on("data", function(chunk) { + finished = false; + bridge.send({ + type: "pipeData", + data: decoder.write(chunk), + tab: response + }, function(err, message) { + // Dunno why, but this always returns No Response... + // Escaping that error so end users aren't confused... + if (err && err.message !== "No Response") + console.log(err.message); + finished = true; + }); }); - }); - - stdin.on("end", function(){ - bridge.send({ type: "pipeClosed"}, function(err, message) { - process.exit(40); + stdin.on("end", function() { + (function retry() { + if(finished) + process.exit(40); + setTimeout(retry, 100); + })(); }); }); } From 4b34d6aa1954ffc518183ecfff43defe3dfa613a Mon Sep 17 00:00:00 2001 From: Shannon Duncan Date: Fri, 12 Feb 2016 21:55:01 +0000 Subject: [PATCH 011/476] remove wrong data --- plugins/c9.cli.open/open.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.cli.open/open.js b/plugins/c9.cli.open/open.js index a89bb42a..f4baf0d7 100755 --- a/plugins/c9.cli.open/open.js +++ b/plugins/c9.cli.open/open.js @@ -27,7 +27,7 @@ define(function(require, exports, module) { cmd.addCommand({ name: "open", info: " Opens a file or directory.", - usage: "[--wait] [--pipe] [--stream] ", + usage: "[--wait] [--pipe] ", options: { "wait": { description: "Wait until the file(s) are closed", From c6d501dd56735631b0eb51fc7615f64aaea5660a Mon Sep 17 00:00:00 2001 From: Shannon Duncan Date: Wed, 17 Feb 2016 22:39:49 +0000 Subject: [PATCH 012/476] added pull request extra --- plugins/c9.cli.open/open.js | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/plugins/c9.cli.open/open.js b/plugins/c9.cli.open/open.js index f4baf0d7..ecb5052a 100755 --- a/plugins/c9.cli.open/open.js +++ b/plugins/c9.cli.open/open.js @@ -139,17 +139,34 @@ define(function(require, exports, module) { } function openWithPipe(callback) { - bridge.send({ type: "pipe" }, function(err, response) { + bridge.send({ type: "pipe" }, function cb(err, response) { if (err) { - console.log(err.message); - return; + if (err.code == "ECONNREFUSED") { + // Seems Cloud9 is not running, lets start it up + startCloud9Local({}, function(success) { + if (success) + bridge.send({ type: "pipe" }, cb); + else { + console.log("Could not start Cloud9. " + + "Please check your configuration."); + callback(err); + + process.exit(40); // This appears to be needed; let's return something useful + } + }); + return; + } + else { + console.log(err.message); + return; + } } var stdin = process.openStdin(); - var finished = false; + var finished = 0; stdin.on("data", function(chunk) { - finished = false; - bridge.send({ + finished++; + bridge.send( { type: "pipeData", data: decoder.write(chunk), tab: response @@ -158,13 +175,13 @@ define(function(require, exports, module) { // Escaping that error so end users aren't confused... if (err && err.message !== "No Response") console.log(err.message); - finished = true; + finished--; }); }); stdin.on("end", function() { (function retry() { - if(finished) - process.exit(40); + if(finished === 0) + process.exit(); setTimeout(retry, 100); })(); }); From 22addca0613621958ed14221b41c43c4a72e4e24 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 13 Mar 2016 21:10:51 +0400 Subject: [PATCH 013/476] cleanup --- bin/c9 | 2 +- plugins/c9.cli.bridge/bridge-client.js | 2 +- plugins/c9.cli.bridge/bridge_commands.js | 27 ++++++++++++++++++------ plugins/c9.cli.open/open.js | 19 +++++++++-------- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/bin/c9 b/bin/c9 index 6d325552..8ed2d891 100755 --- a/bin/c9 +++ b/bin/c9 @@ -1,8 +1,8 @@ #!/usr/bin/env node // workaround for npm 3 breaking bundled dependencies +var Module = require("module"); if (Module.REPLACE_NODE_MODULE_PATH) { - var Module = require("module"); var path = require("path") var _resolveFilename_orig = Module._resolveFilename Module._resolveFilename = function(id, parent) { diff --git a/plugins/c9.cli.bridge/bridge-client.js b/plugins/c9.cli.bridge/bridge-client.js index f27353be..c5325542 100644 --- a/plugins/c9.cli.bridge/bridge-client.js +++ b/plugins/c9.cli.bridge/bridge-client.js @@ -59,7 +59,7 @@ define(function(require, exports, module) { if (done) return; callback(new Error("No Response")); done = true; - }) + }); }); } diff --git a/plugins/c9.cli.bridge/bridge_commands.js b/plugins/c9.cli.bridge/bridge_commands.js index 1ec548ad..5e697a0a 100644 --- a/plugins/c9.cli.bridge/bridge_commands.js +++ b/plugins/c9.cli.bridge/bridge_commands.js @@ -74,20 +74,25 @@ define(function(require, exports, module) { /***** Methods *****/ function createPipe(message, callback) { tabManager.once("ready", function(){ - tabManager.open( { - focus: true, - editorType: "ace" + tabManager.open({ + focus: true, + editorType: "ace", + path: message.path && c9.toInternalPath(message.path), + document: { meta : { newfile: true } } }, function(err, tab) { if (err) return callback(err); - callback(null, tab.name); + callback(null, tab.path || tab.name); }); }); } function updatePipe(message, callback) { tabManager.once("ready", function() { - tabManager.findTab(message.tab).document.value += message.data; + var tab = tabManager.findTab(message.tab); + var c9Session = tab && tab.document.getSession(); + if (c9Session && c9Session.session) + c9Session.session.insert({row: Number.MAX_VALUE, column: Number.MAX_VALUE} , message.data); callback(null, true); }); } @@ -127,12 +132,22 @@ define(function(require, exports, module) { } else { tabManager.once("ready", function(){ + var m = /:(\d*)(?::(\d*))?$/.exec(path); + var jump = {}; + if (m) { + if (m[1]) + jump.row = parseInt(m[1], 10) - 1; + if (m[2]) + jump.column = parseInt(m[2], 10); + path = path.slice(0, m.index); + } + fs.exists(path, function(existing) { var tab = tabManager.open({ path: path, focus: i === 0, document: existing - ? undefined + ? { ace: { jump: jump } } : { meta : { newfile: true } } }, function(){ next(); diff --git a/plugins/c9.cli.open/open.js b/plugins/c9.cli.open/open.js index ecb5052a..5b8b68da 100755 --- a/plugins/c9.cli.open/open.js +++ b/plugins/c9.cli.open/open.js @@ -11,8 +11,6 @@ define(function(require, exports, module) { var fs = require("fs"); var PATH = require("path"); - var StringDecoder = require('string_decoder').StringDecoder; - var decoder = new StringDecoder("utf8"); /***** Initialization *****/ @@ -45,7 +43,7 @@ define(function(require, exports, module) { throw new Error("Missing path"); }, exec: function(argv) { - if(argv.pipe) { + if (argv.pipe) { openWithPipe(function(){}); return; } @@ -60,7 +58,6 @@ define(function(require, exports, module) { /***** Methods *****/ function open(paths, wait, callback) { - try { paths = paths.map(function(path) { var isDir = fs.existsSync(path) && fs.statSync(path).isDirectory(); @@ -139,7 +136,10 @@ define(function(require, exports, module) { } function openWithPipe(callback) { - bridge.send({ type: "pipe" }, function cb(err, response) { + bridge.send({ + type: "pipe", + path: process.cwd() + "/" + "Pipe " + (new Date()).toLocaleString().replace(/:/g, "."), + }, function cb(err, response) { if (err) { if (err.code == "ECONNREFUSED") { // Seems Cloud9 is not running, lets start it up @@ -163,12 +163,13 @@ define(function(require, exports, module) { } var stdin = process.openStdin(); + stdin.setEncoding("utf8"); var finished = 0; stdin.on("data", function(chunk) { finished++; - bridge.send( { - type: "pipeData", - data: decoder.write(chunk), + bridge.send({ + type: "pipeData", + data: chunk, tab: response }, function(err, message) { // Dunno why, but this always returns No Response... @@ -180,7 +181,7 @@ define(function(require, exports, module) { }); stdin.on("end", function() { (function retry() { - if(finished === 0) + if (finished === 0) process.exit(); setTimeout(retry, 100); })(); From 7cfc8390a326c097c11c3d441ccdb7ae7dc90c3e Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Mon, 14 Mar 2016 11:21:46 +0000 Subject: [PATCH 014/476] Pass workspace premiumness to IDE --- configs/client-default.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index d4f5985e..7756c0fc 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -694,14 +694,15 @@ module.exports = function(options) { no_newsletter: options.user.no_newsletter, subscription_on_signup: options.user.subscription_on_signup, premium: options.user.premium, - region: options.user.region + region: options.user.region, }, project: { id: options.project.id, name: options.project.name, contents: options.project.contents, descr: options.project.descr, - remote: options.project.remote + remote: options.project.remote, + premium: options.project.premium, } }, { From 537e13ef87316e19a788ecb3b2acd2cd2d997c60 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 15:01:45 +0100 Subject: [PATCH 015/476] c9-auto-bump 3.1.1777 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8e9505b2..aaa861bc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1776", + "version": "3.1.1777", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8f5695531992fbcd8114f4b1a261ddd9ad886333 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 15:03:38 +0100 Subject: [PATCH 016/476] c9-auto-bump 3.1.1778 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aaa861bc..dc62a310 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1777", + "version": "3.1.1778", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 81a99dc45b7f016ce033a0e754ea88fdbca52f96 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 15:50:51 +0100 Subject: [PATCH 017/476] c9-auto-bump 3.1.1779 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc62a310..30226be7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1778", + "version": "3.1.1779", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 200cf98bfdf55d2fa4180656f468d7547c7dd86e Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 16:14:14 +0100 Subject: [PATCH 018/476] c9-auto-bump 3.1.1780 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 30226be7..feaae0f2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1779", + "version": "3.1.1780", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6a2f8bfda0eb8b230b2d8560411874e26128b459 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 16:14:41 +0100 Subject: [PATCH 019/476] c9-auto-bump 3.1.1781 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index feaae0f2..c08aca51 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1780", + "version": "3.1.1781", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3710f7b6468896fbd3369112d006f87eb3fcd6d3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 16:15:17 +0100 Subject: [PATCH 020/476] c9-auto-bump 3.1.1782 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c08aca51..c8f1ac28 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1781", + "version": "3.1.1782", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 93e9674c01d60b71759647a800d1e53909c3b81f Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 16:33:44 +0100 Subject: [PATCH 021/476] c9-auto-bump 3.1.1783 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c8f1ac28..b759ebd0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1782", + "version": "3.1.1783", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fd6a1a2f55ece376e7c259f109dd31ec3e4213e2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 16:35:56 +0100 Subject: [PATCH 022/476] c9-auto-bump 3.1.1784 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b759ebd0..9871836f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1783", + "version": "3.1.1784", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 61598471a6c573e9eed5959785dcc97519d8b83e Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 16:39:19 +0100 Subject: [PATCH 023/476] c9-auto-bump 3.1.1785 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9871836f..e6dc3288 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1784", + "version": "3.1.1785", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d0008c2a317cdfc66b3eb80b39038e2b6331b2a7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 17:37:20 +0100 Subject: [PATCH 024/476] c9-auto-bump 3.1.1786 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6dc3288..09ac824a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1785", + "version": "3.1.1786", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fcb81d7a7acef9ab8f0370f4dead93adc5c75178 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 14 Mar 2016 21:29:56 +0100 Subject: [PATCH 025/476] c9-auto-bump 3.1.1787 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 09ac824a..dbc5ab15 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1786", + "version": "3.1.1787", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 11d8544991ae74fba68220a2f9538d452c6d0bcc Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 00:15:46 +0100 Subject: [PATCH 026/476] c9-auto-bump 3.1.1788 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbc5ab15..7e1147a7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1787", + "version": "3.1.1788", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 35d6bcfa6507a8a95a057f1a83ab66fc35fa48ea Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 00:16:12 +0100 Subject: [PATCH 027/476] c9-auto-bump 3.1.1789 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7e1147a7..2287cf45 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1788", + "version": "3.1.1789", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 798869b73d00fc2a3e438796d879ade6a3f129d2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 00:18:16 +0100 Subject: [PATCH 028/476] c9-auto-bump 3.1.1790 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2287cf45..a8ef5955 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1789", + "version": "3.1.1790", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a6d688306ba15dd0981b9cdc865478a74eab8a80 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 06:22:52 +0100 Subject: [PATCH 029/476] c9-auto-bump 3.1.1791 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8ef5955..54b191a5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1790", + "version": "3.1.1791", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3f8cadcc3fdc935d6ea5f6b7b943ea0c3484b22b Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 06:24:15 +0100 Subject: [PATCH 030/476] c9-auto-bump 3.1.1792 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54b191a5..86681c32 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1791", + "version": "3.1.1792", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 919902aeccee8a1c7d6fb0155477a66cd222c3ab Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 07:05:07 +0100 Subject: [PATCH 031/476] c9-auto-bump 3.1.1793 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 86681c32..e19bf624 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1792", + "version": "3.1.1793", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 15fb9841c50e4c12b531564ee97e15e90118cece Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 07:51:57 +0100 Subject: [PATCH 032/476] c9-auto-bump 3.1.1794 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e19bf624..5971a45a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1793", + "version": "3.1.1794", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ff8e4fcca8235e1639f6e1591018152fac46176b Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 08:15:43 +0100 Subject: [PATCH 033/476] c9-auto-bump 3.1.1795 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5971a45a..a31dde0d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1794", + "version": "3.1.1795", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 663b981363f5386859dd52216bb8ef29c75bba0b Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 08:45:19 +0100 Subject: [PATCH 034/476] c9-auto-bump 3.1.1796 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a31dde0d..14b9b245 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1795", + "version": "3.1.1796", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f654b350e4c3c4e9e4dcb9c9d73f273ec3a02bc3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 09:07:12 +0100 Subject: [PATCH 035/476] c9-auto-bump 3.1.1797 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 14b9b245..1881c99b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1796", + "version": "3.1.1797", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 9e21a96d2a255ce30667f8c6211357acbcb439fb Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 10:25:01 +0100 Subject: [PATCH 036/476] c9-auto-bump 3.1.1798 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1881c99b..fefdb74b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1797", + "version": "3.1.1798", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fa1219a2498b210116c8125def162b03ee77e648 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 10:58:12 +0100 Subject: [PATCH 037/476] c9-auto-bump 3.1.1799 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fefdb74b..036d068a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1798", + "version": "3.1.1799", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 04043f6afa46bbf70fcf42de8e14081d2d2d37a6 Mon Sep 17 00:00:00 2001 From: Rob Moran Date: Sun, 13 Mar 2016 13:59:38 +0000 Subject: [PATCH 038/476] Added config option to "output" terminal to hide toolbar --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1881c99b..ddc24f55 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "c9.ide.recentfiles": "#7c099abf40", "c9.ide.remote": "#301d2ab519", "c9.ide.processlist": "#2b12cd1bdd", - "c9.ide.run": "#4f0257bc0b", + "c9.ide.run": "#b0920c076d", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#86f0f38160", From 29c1649c65d368de628f5e92d99a411434c4c5f6 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 10 Mar 2016 23:21:15 +0400 Subject: [PATCH 039/476] restore "Add location bar to allow specify custom repository location" --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ddc24f55..ce364a08 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#86f0f38160", - "c9.ide.scm": "#f1d190fa51", + "c9.ide.scm": "#dc87315012", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#a282ec1619", "c9.ide.test.mocha": "#fc053b23d2", From 0dafa980322f9a0f9689821fe5b2370c4462424f Mon Sep 17 00:00:00 2001 From: Rob Moran Date: Tue, 1 Mar 2016 10:44:50 +0000 Subject: [PATCH 040/476] Updated the dialog.update() function to be generic --- plugins/c9.ide.dialog/dialog.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js index bf5d15e3..21f49bfc 100644 --- a/plugins/c9.ide.dialog/dialog.js +++ b/plugins/c9.ide.dialog/dialog.js @@ -245,14 +245,21 @@ define(function(require, module, exports) { dropdown.setAttribute("value", item.value); break; default: - if ("value" in item) - el.setAttribute('value', item.value); if ("onclick" in item) el.onclick = item.onclick; - if ("visible" in item) - el.setAttribute("visible", item.visible); - if ("zindex" in item) - el.setAttribute("zindex", item.zindex); + + var ignoreList = ["onclick"]; + + Object.keys(item).forEach(function(key) { + if (ignoreList.indexOf(key) > -1) return; + + var attributeExists = el.attributes.some(function(attribute) { + return (attribute.name === key) + }); + + if (attributeExists) + el.setAttribute(key, item[key]); + }); break; } }); From 784b3edaec0497c517252ee7ba31a430834765a7 Mon Sep 17 00:00:00 2001 From: Rob Moran Date: Tue, 1 Mar 2016 10:51:37 +0000 Subject: [PATCH 041/476] Updated the forms.update() function to be generic --- plugins/c9.ide.ui/forms.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/plugins/c9.ide.ui/forms.js b/plugins/c9.ide.ui/forms.js index a8d916bd..1a4072d0 100644 --- a/plugins/c9.ide.ui/forms.js +++ b/plugins/c9.ide.ui/forms.js @@ -481,14 +481,21 @@ define(function(require, exports, module) { } break; default: - if ("value" in item) - el.lastChild.setAttribute('value', item.value); if ("onclick" in item) el.lastChild.onclick = item.onclick; - if ("visible" in item) - el.lastChild.setAttribute("visible", item.visible) - if ("zindex" in item) - el.lastChild.setAttribute("zindex", item.zindex) + + var ignoreList = ["onclick"]; + + Object.keys(item).forEach(function(key) { + if (ignoreList.indexOf(key) > -1) return; + + var attributeExists = el.lastChild.attributes.some(function(attribute) { + return (attribute.name === key) + }); + + if (attributeExists) + el.lastChild.setAttribute(key, item[key]); + }); break; } }) From e8ad218fb63fb7d5325386d9967e7e65eabb5bd2 Mon Sep 17 00:00:00 2001 From: Rob Moran Date: Thu, 10 Mar 2016 11:01:06 +0000 Subject: [PATCH 042/476] Changed update() command to check for explicit attributes and fall back to checking the attributes array if it exists --- plugins/c9.ide.dialog/dialog.js | 38 ++++++++++++++++++++++++--------- plugins/c9.ide.ui/forms.js | 38 ++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js index 21f49bfc..ab25a3f7 100644 --- a/plugins/c9.ide.dialog/dialog.js +++ b/plugins/c9.ide.dialog/dialog.js @@ -245,20 +245,38 @@ define(function(require, module, exports) { dropdown.setAttribute("value", item.value); break; default: - if ("onclick" in item) - el.onclick = item.onclick; - - var ignoreList = ["onclick"]; + // Attributes we are happy to set directly + var validAttributes = [ + "value", + "visible", + "zindex", + "disabled", + "caption", + "tooltip", + "command", + "class", + "icon", + "src", + "submenu" + ]; Object.keys(item).forEach(function(key) { - if (ignoreList.indexOf(key) > -1) return; + // Check for onclick explictly + if (key === "onclick") + return el.onclick = item.onclick; - var attributeExists = el.attributes.some(function(attribute) { - return (attribute.name === key) - }); + // Check for attributes we know exist and will directly set + if (validAttributes.indexOf(key) > -1) + return el.setAttribute(key, item[key]); - if (attributeExists) - el.setAttribute(key, item[key]); + // Otherwise, check if the object has the attribute to set + if (el.attributes) { + var attributeExists = el.attributes.some(function(attribute) { + return (attribute.name === key); + }); + if (attributeExists) + el.setAttribute(key, item[key]); + } }); break; } diff --git a/plugins/c9.ide.ui/forms.js b/plugins/c9.ide.ui/forms.js index 1a4072d0..4aaf2d45 100644 --- a/plugins/c9.ide.ui/forms.js +++ b/plugins/c9.ide.ui/forms.js @@ -481,20 +481,38 @@ define(function(require, exports, module) { } break; default: - if ("onclick" in item) - el.lastChild.onclick = item.onclick; - - var ignoreList = ["onclick"]; + // Attributes we are happy to set directly + var validAttributes = [ + "value", + "visible", + "zindex", + "disabled", + "caption", + "tooltip", + "command", + "class", + "icon", + "src", + "submenu" + ]; Object.keys(item).forEach(function(key) { - if (ignoreList.indexOf(key) > -1) return; + // Check for onclick explictly + if (key === "onclick") + return el.lastChild.onclick = item.onclick; - var attributeExists = el.lastChild.attributes.some(function(attribute) { - return (attribute.name === key) - }); + // Check for attributes we know exist and will directly set + if (validAttributes.indexOf(key) > -1) + return el.lastChild.setAttribute(key, item[key]); - if (attributeExists) - el.lastChild.setAttribute(key, item[key]); + // Otherwise, check if the object has the attribute to set + if (el.lastChild && el.lastChild.attributes) { + var attributeExists = el.lastChild.attributes.some(function(attribute) { + return (attribute.name === key); + }); + if (attributeExists) + el.lastChild.setAttribute(key, item[key]); + } }); break; } From 0d240174b3238fa90eac1c52a1118c26cad25ce1 Mon Sep 17 00:00:00 2001 From: "David J. Malan" Date: Thu, 10 Mar 2016 05:26:53 +0000 Subject: [PATCH 043/476] Reverted addition of fourth parameter to proposeLayoutChange. Added resetTheme instead. --- plugins/c9.ide.layout.classic/layout.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/plugins/c9.ide.layout.classic/layout.js b/plugins/c9.ide.layout.classic/layout.js index d2789759..50d4c6de 100644 --- a/plugins/c9.ide.layout.classic/layout.js +++ b/plugins/c9.ide.layout.classic/layout.js @@ -214,7 +214,7 @@ define(function(require, exports, module) { } } - function proposeLayoutChange(kind, force, type, reset) { + function proposeLayoutChange(kind, force, type) { if (!force && settings.getBool("user/general/@propose")) return; @@ -225,7 +225,7 @@ define(function(require, exports, module) { ignoreTheme = true; var theme = {"dark": "flat-dark", "light": "flat-light"}[kind]; settings.set("user/general/@skin", theme); - updateTheme(!!reset, type); + updateTheme(false, type); ignoreTheme = false; settings.set("user/general/@propose", question.dontAsk); }, @@ -357,6 +357,14 @@ define(function(require, exports, module) { }), 300, plugin); } + function resetTheme(theme, type) { + ignoreTheme = true; + settings.set("user/general/@skin", theme); + updateTheme(true); + emit("themeDefaults", {theme: theme, type: type}); + ignoreTheme = false; + } + function resize(){ if (c9console && tabManager) { var tRect = tabManager.container.$ext.getBoundingClientRect(); @@ -597,7 +605,7 @@ define(function(require, exports, module) { get theme(){ return theme; }, - + /** * Returns an AMLElement that can server as a parent. * @param {Plugin} plugin The plugin for which to find the parent. @@ -613,6 +621,13 @@ define(function(require, exports, module) { */ initMenus: initMenus, + /** + * Resets theme (without questioning user). + * @param {String} theme Theme to use. + * @param {String} type Type of editor to use. + */ + resetTheme: resetTheme, + /** * Sets the layout in one of two default modes: * @param {"default"|"minimal"} type From e8d34db9302e151ac761a66d9b9378c6bb385c3b Mon Sep 17 00:00:00 2001 From: mimibar Date: Mon, 29 Feb 2016 18:26:44 -0600 Subject: [PATCH 044/476] #188 Adding crossorigin attribute to mocha and require scripts In relation to Issue #188 Running unit tests for C9 plugins leads to 404 errors when trying to fetch mocha --- plugins/c9.ide.plugins/test.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/c9.ide.plugins/test.html b/plugins/c9.ide.plugins/test.html index 309727c7..328b7481 100644 --- a/plugins/c9.ide.plugins/test.html +++ b/plugins/c9.ide.plugins/test.html @@ -38,8 +38,8 @@
- - + + - \ No newline at end of file + From b7d9b186bc84db31d40714355187b53fa735b0cb Mon Sep 17 00:00:00 2001 From: Chris Brown Date: Fri, 11 Mar 2016 12:43:01 +0400 Subject: [PATCH 045/476] Fixed a Windows bug where changing the working directory of a runner resulted in the absolute directory being appended to itself, causing the VFS worker to crash --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ce364a08..ec52b263 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "c9.ide.recentfiles": "#7c099abf40", "c9.ide.remote": "#301d2ab519", "c9.ide.processlist": "#2b12cd1bdd", - "c9.ide.run": "#b0920c076d", + "c9.ide.run": "#485f06bd22", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#86f0f38160", From 53c2e7ec7d0e81f13fc650e6f90bedd7ecc5bef7 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 15 Mar 2016 15:58:58 +0400 Subject: [PATCH 046/476] update nak --- package.json | 2 +- scripts/install-sdk.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ec52b263..13f33423 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "mkdirp": "~0.3.5", "msgpack-js": "~0.1.1", "msgpack-js-browser": "~0.1.4", - "nak": "git://github.com/cloud9ide/nak.git#719f2188ec1d8e4ce553286e80737d7e6434d777", + "nak": "git://github.com/cloud9ide/nak.git#6deef931594", "netutil": "~0.0.2", "optimist": "~0.6.0", "qs": "0.6.6", diff --git a/scripts/install-sdk.sh b/scripts/install-sdk.sh index 38448df0..a953cad5 100755 --- a/scripts/install-sdk.sh +++ b/scripts/install-sdk.sh @@ -96,7 +96,7 @@ updateNodeModules() { echo "${magenta}--- Running npm install --------------------------------------------${resetColor}" safeInstall(){ deps=(`"$NODE" -e 'console.log(Object.keys(require("./package.json").dependencies).join(" "))'`) - for m in $deps; do echo $m; + for m in ${deps[@]}; do echo $m; "$NPM" install --loglevel warn $m || true done } From 16a7b6447186d0f42bebaa1e175c8ae160461cd1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 13:23:25 +0100 Subject: [PATCH 047/476] c9-auto-bump 3.1.1800 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 036d068a..32b9e87d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1799", + "version": "3.1.1800", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c75b49281180297f75d5b31af9e00d7750c272ad Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 13:34:33 +0100 Subject: [PATCH 048/476] c9-auto-bump 3.1.1801 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 32b9e87d..b6a17b92 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1800", + "version": "3.1.1801", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 9ac6556d5a73418c17156b1378322ca19d1766a7 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 15 Mar 2016 17:23:21 +0400 Subject: [PATCH 049/476] fix el.attributes is not an array error --- plugins/c9.ide.dialog/dialog.js | 29 +++-------------------------- plugins/c9.ide.ui/forms.js | 33 +++++---------------------------- 2 files changed, 8 insertions(+), 54 deletions(-) diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js index ab25a3f7..77f36633 100644 --- a/plugins/c9.ide.dialog/dialog.js +++ b/plugins/c9.ide.dialog/dialog.js @@ -245,38 +245,15 @@ define(function(require, module, exports) { dropdown.setAttribute("value", item.value); break; default: - // Attributes we are happy to set directly - var validAttributes = [ - "value", - "visible", - "zindex", - "disabled", - "caption", - "tooltip", - "command", - "class", - "icon", - "src", - "submenu" - ]; - + // supported attributes + var validAttributes = /^(value|visible|zindex|disabled|caption|tooltip|command|class|icon|src|submenu)$/; Object.keys(item).forEach(function(key) { // Check for onclick explictly if (key === "onclick") return el.onclick = item.onclick; - // Check for attributes we know exist and will directly set - if (validAttributes.indexOf(key) > -1) + if (validAttributes.test(key)) return el.setAttribute(key, item[key]); - - // Otherwise, check if the object has the attribute to set - if (el.attributes) { - var attributeExists = el.attributes.some(function(attribute) { - return (attribute.name === key); - }); - if (attributeExists) - el.setAttribute(key, item[key]); - } }); break; } diff --git a/plugins/c9.ide.ui/forms.js b/plugins/c9.ide.ui/forms.js index 4aaf2d45..31171f9d 100644 --- a/plugins/c9.ide.ui/forms.js +++ b/plugins/c9.ide.ui/forms.js @@ -481,38 +481,15 @@ define(function(require, exports, module) { } break; default: - // Attributes we are happy to set directly - var validAttributes = [ - "value", - "visible", - "zindex", - "disabled", - "caption", - "tooltip", - "command", - "class", - "icon", - "src", - "submenu" - ]; - + // supported attributes + var validAttributes = /^(value|visible|zindex|disabled|caption|tooltip|command|class|icon|src|submenu)$/; Object.keys(item).forEach(function(key) { // Check for onclick explictly if (key === "onclick") - return el.lastChild.onclick = item.onclick; - + return el.onclick = item.onclick; // Check for attributes we know exist and will directly set - if (validAttributes.indexOf(key) > -1) - return el.lastChild.setAttribute(key, item[key]); - - // Otherwise, check if the object has the attribute to set - if (el.lastChild && el.lastChild.attributes) { - var attributeExists = el.lastChild.attributes.some(function(attribute) { - return (attribute.name === key); - }); - if (attributeExists) - el.lastChild.setAttribute(key, item[key]); - } + if (validAttributes.test(key)) + return el.setAttribute(key, item[key]); }); break; } From eb93b76bf0406b6bc9482d6d52bc9149219908e7 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 15 Mar 2016 17:24:35 +0400 Subject: [PATCH 050/476] fix saveAs>overwrite dialog --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 13f33423..50bd5912 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "c9.ide.run": "#485f06bd22", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", - "c9.ide.save": "#86f0f38160", + "c9.ide.save": "#4cda35bfdb", "c9.ide.scm": "#dc87315012", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#a282ec1619", From 475b10d9f4e0296ef1cb0546a6e438cb769cd9ca Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 14:48:40 +0100 Subject: [PATCH 051/476] c9-auto-bump 3.1.1802 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6a17b92..2fd80af6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1801", + "version": "3.1.1802", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e187e4e70dd3900c37f9b0c9b740b20c3334ee68 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 15:03:31 +0100 Subject: [PATCH 052/476] c9-auto-bump 3.1.1803 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2fd80af6..dde24c74 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1802", + "version": "3.1.1803", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f80047821e96a280a6a78775df0673b7c7768063 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 15:11:57 +0100 Subject: [PATCH 053/476] c9-auto-bump 3.1.1804 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dde24c74..c9eb6be5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1803", + "version": "3.1.1804", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b5ef3585e15f2a6644a97fc19d2fac7d5f6261aa Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 15:13:52 +0100 Subject: [PATCH 054/476] c9-auto-bump 3.1.1805 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c9eb6be5..72ad5730 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1804", + "version": "3.1.1805", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5923404f242e730c9a38c723871f755349a193a1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 15:39:41 +0100 Subject: [PATCH 055/476] c9-auto-bump 3.1.1806 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72ad5730..793ca78f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1805", + "version": "3.1.1806", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 60e6e695842a11c3ca40e919f5f34a88f2a971d2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 15 Mar 2016 16:42:51 +0100 Subject: [PATCH 056/476] c9-auto-bump 3.1.1807 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 793ca78f..53626631 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1806", + "version": "3.1.1807", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 24f001d98adef88c428ff06b2cd1781ce23d936f Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 13 Mar 2016 23:02:31 +0400 Subject: [PATCH 057/476] more rubust handling of eslint config --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 53626631..eaf7e5c7 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "c9.ide.language.html.diff": "#24f3608d26", "c9.ide.language.javascript": "#d1a479805c", "c9.ide.language.javascript.immediate": "#c8b1e5767a", - "c9.ide.language.javascript.eslint": "#3c57ed1720", + "c9.ide.language.javascript.eslint": "#4de5457db1", "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", From 50640cbeefb8a92ad477f35c7482a8ed97de8b86 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 16 Mar 2016 01:19:48 +0400 Subject: [PATCH 058/476] load worker from c9.io to fix loading on ie and firefox --- node_modules/ace/lib/ace/worker/worker.js | 2 +- node_modules/ace/lib/ace/worker/worker_client.js | 9 ++++++--- package.json | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/node_modules/ace/lib/ace/worker/worker.js b/node_modules/ace/lib/ace/worker/worker.js index 856a6ea9..eb5bb876 100644 --- a/node_modules/ace/lib/ace/worker/worker.js +++ b/node_modules/ace/lib/ace/worker/worker.js @@ -200,7 +200,7 @@ window.onmessage = function(e) { sender._signal(msg.event, msg.data); } else if (msg.command) { - if (main[msg.command]) + if (main && main[msg.command]) main[msg.command].apply(main, msg.args); else if (window[msg.command]) window[msg.command].apply(window, msg.args); diff --git a/node_modules/ace/lib/ace/worker/worker_client.js b/node_modules/ace/lib/ace/worker/worker_client.js index 42c08f43..104f198c 100644 --- a/node_modules/ace/lib/ace/worker/worker_client.js +++ b/node_modules/ace/lib/ace/worker/worker_client.js @@ -36,7 +36,7 @@ var net = require("../lib/net"); var EventEmitter = require("../lib/event_emitter").EventEmitter; var config = require("../config"); -var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl) { +var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl, importScripts) { this.$sendDeltaQueue = this.$sendDeltaQueue.bind(this); this.changeListener = this.changeListener.bind(this); this.onMessage = this.onMessage.bind(this); @@ -75,6 +75,9 @@ var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl) { throw e; } } + if (importScripts) { + this.send("importScripts", importScripts); + } this.$worker.postMessage({ init : true, tlns : tlns, @@ -94,7 +97,7 @@ var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl) { this.onMessage = function(e) { var msg = e.data; - switch(msg.type) { + switch (msg.type) { case "event": this._signal(msg.name, {data: msg.data}); break; @@ -157,7 +160,7 @@ var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl) { }; this.attachToDocument = function(doc) { - if(this.$doc) + if (this.$doc) this.terminate(); this.$doc = doc; diff --git a/package.json b/package.json index eaf7e5c7..68944824 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#db77f906a2", + "c9.ide.language": "#f03e5ca0c8", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", From 9cdbadf73534e18e5980c77ec479cab9cbf9b377 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 00:56:09 +0100 Subject: [PATCH 059/476] c9-auto-bump 3.1.1808 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 53626631..918efe1a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1807", + "version": "3.1.1808", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6cc153e712c64ef8326c195d27a2c224f84429c6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 02:20:09 +0100 Subject: [PATCH 060/476] c9-auto-bump 3.1.1809 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 918efe1a..83cdbc85 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1808", + "version": "3.1.1809", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7fb44f0fe480c39f5c1b344b8ffe982dea8aeb1b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 06:19:22 +0100 Subject: [PATCH 061/476] c9-auto-bump 3.1.1810 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 83cdbc85..a550183c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1809", + "version": "3.1.1810", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8a6ae526f5b54d8aa0f46de9639e6ca5c60a9b4f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 09:56:11 +0100 Subject: [PATCH 062/476] c9-auto-bump 3.1.1811 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a550183c..8504b28f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1810", + "version": "3.1.1811", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 49d27c16240d83dcfad7a8032c80cd0f09392452 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 10:04:06 +0100 Subject: [PATCH 063/476] c9-auto-bump 3.1.1812 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8504b28f..688f6e4f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1811", + "version": "3.1.1812", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 92407787952afae74263f375e2768c77fe264d0f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 10:04:22 +0100 Subject: [PATCH 064/476] c9-auto-bump 3.1.1813 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 688f6e4f..0a77bb01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1812", + "version": "3.1.1813", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 72fc8ee37548704322906536810fd9e54313c497 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 10:04:54 +0100 Subject: [PATCH 065/476] c9-auto-bump 3.1.1814 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a77bb01..9cd08539 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1813", + "version": "3.1.1814", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 924e29513b72561321b615a3a2c41472ee880b6b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 10:43:38 +0100 Subject: [PATCH 066/476] c9-auto-bump 3.1.1815 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9cd08539..b8d47d25 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1814", + "version": "3.1.1815", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1065a1bef594a7d1ec93eee16ac3ac2e06a6a432 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 11:50:01 +0100 Subject: [PATCH 067/476] c9-auto-bump 3.1.1816 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b8d47d25..9654930b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1815", + "version": "3.1.1816", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5afe50bc7bae5a128afea7df533b2ca7e757ee20 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 12:47:31 +0100 Subject: [PATCH 068/476] c9-auto-bump 3.1.1817 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9654930b..370d27b3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1816", + "version": "3.1.1817", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2e10276b2e57ed48791beaafb34e6ddde943aa6a Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 12:47:53 +0100 Subject: [PATCH 069/476] c9-auto-bump 3.1.1818 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 370d27b3..a07dc2c6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1817", + "version": "3.1.1818", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 272e2b253e0190614a7807df1dc0468a8ee6eb67 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 14:01:06 +0100 Subject: [PATCH 070/476] c9-auto-bump 3.1.1819 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a07dc2c6..f94c4d3b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1818", + "version": "3.1.1819", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4dad81677d15c0c2b6a9c2bb83760ca05de55efa Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 16 Mar 2016 17:43:18 +0400 Subject: [PATCH 071/476] move npm freeze logic into standalone module --- bin/c9 | 18 ------ node_modules/architect-build/npm_freeze.js | 69 ++++++++++++++++++++++ 2 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 node_modules/architect-build/npm_freeze.js diff --git a/bin/c9 b/bin/c9 index 8ed2d891..9de38075 100755 --- a/bin/c9 +++ b/bin/c9 @@ -1,23 +1,5 @@ #!/usr/bin/env node -// workaround for npm 3 breaking bundled dependencies -var Module = require("module"); -if (Module.REPLACE_NODE_MODULE_PATH) { - var path = require("path") - var _resolveFilename_orig = Module._resolveFilename - Module._resolveFilename = function(id, parent) { - var root = path.join(__dirname, "/.."); - if (parent && parent.paths && parent.paths[0] && parent.paths[0].indexOf(root) == 0) { - parent.paths = parent.paths.map(function(p) { - if (p.indexOf(root) != 0) return - p = p.slice(root.length); - return root + p.replace(/([\\\/]|^)node_modules([\\\/]|$)/g, "$1n_m$2"); - }).filter(Boolean); - } - return _resolveFilename_orig.call(Module, id, parent); - }; -} - // Architect var architect = require("architect"); diff --git a/node_modules/architect-build/npm_freeze.js b/node_modules/architect-build/npm_freeze.js new file mode 100644 index 00000000..eb3a1353 --- /dev/null +++ b/node_modules/architect-build/npm_freeze.js @@ -0,0 +1,69 @@ +var patchTemplate = ";(" +function() { + // automatically generated by architect-build + // bundle all dependencies in the main package + var Module = require("module"); + var path = require("path"); + var _resolveFilename_orig = Module._resolveFilename + var root = path.join(__dirname, "{root}"); + Module._resolveFilename = function(id, parent) { + if (parent && parent.paths && parent.paths[0] && parent.paths[0].indexOf(root) == 0) { + parent.paths = parent.paths.map(function(p) { + if (p.indexOf(root) != 0) return + p = p.slice(root.length); + return root + p.replace(/([\\\/]|^)node_modules([\\\/]|$)/g, "$1n_m$2"); + }).filter(Boolean); + } + return _resolveFilename_orig.call(Module, id, parent); + }; +} + ")();"; + +////////////////////////////////////////////////////////////////////////// + +var fs = require("fs"); +var copy = require("architect-build/copy"); +var pathLib = require("path"); + +function freeze(path, mode) { + path = copy.convertPath(path); + var pkgs = {}; + function freezePkg(path) { + if (!pkgs[path]) { + pkgs[path] = JSON.parse(fs.readFileSync(path + "/package.json")) + Object.keys(pkgs[path]).forEach(function(k) { + if (/Dependencies/i.test(k)) delete pkgs[path][k]; + }) + } + pkgs[path].dependencies = {}; + var deps = fs.existsSync(path + "/node_modules") ? fs.readdirSync(path + "/node_modules") : []; + deps.forEach(function(n) { + if (n == ".bin") return; + var depPath = path + "/node_modules/" + n; + freezePkg(depPath); + pkgs[path].dependencies[n] = pkgs[depPath].version; + }); + if (mode == "rename") { + if (deps.length) { + fs.renameSync(path + "/node_modules/", path + "/n_m") + delete pkgs[path].dependencies + if (pkgs[path].files) + pkgs[path].files.push("n_m") + } + } else { + pkgs[path].bundledDependencies = Object.keys(pkgs[path].dependencies); + } + fs.writeFileSync(path + "/package.json", JSON.stringify(pkgs[path], null, "\t"), "utf8"); + } + freezePkg(path); + var bin = pkgs[path].bin; + Object.keys(bin).forEach(function(key) { + var p = bin[key]; + var root = pathLib.relative(pathLib.dirname(p), "").replace(/[\\]/g, "/"); + var src = fs.readFileSync(path + "/" + p, "utf8"); + src = src.replace(/^(#.*|"use strict";?|\s)*/, function(a) { + return a.trim() + "\n\n" + patchTemplate.replace(/{root}/g, root) + "\n\n"; + }); + fs.writeFileSync(path + "/" + p, src, "utf8"); + }); +} + +module.exports = freeze; From a136a32099e8f75619373bbb9f96a4c1aa7045fe Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 15:00:06 +0100 Subject: [PATCH 072/476] c9-auto-bump 3.1.1820 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f94c4d3b..a2922fff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1819", + "version": "3.1.1820", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ee8875aa98ba8aa91830328e44475f1a17d33e42 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 15:26:07 +0100 Subject: [PATCH 073/476] c9-auto-bump 3.1.1821 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2922fff..fa2fb5e9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1820", + "version": "3.1.1821", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3a933b64eac28df1de14d22f984a7c92d2ef0570 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 16:00:23 +0100 Subject: [PATCH 074/476] c9-auto-bump 3.1.1822 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fa2fb5e9..0bcbd009 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1821", + "version": "3.1.1822", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f17461fe40ff0bc3113bccdec65b68ea6606af6e Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 16 Mar 2016 15:17:06 +0000 Subject: [PATCH 075/476] Fix guided tour now showing --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fa2fb5e9..4cc2bf93 100644 --- a/package.json +++ b/package.json @@ -118,6 +118,6 @@ "c9.ide.undo": "#b028bcb4d5", "c9.ide.upload": "#0bd010d3dc", "c9.ide.welcome": "#5b86c44e92", - "c9.ide.guide": "#16537f57cf" + "c9.ide.guide": "#d2e406b5e3" } } \ No newline at end of file From d8933758a97c17b2d7bdcd6561894376869e4b25 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 16:48:49 +0100 Subject: [PATCH 076/476] c9-auto-bump 3.1.1823 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bcbd009..8a56218f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1822", + "version": "3.1.1823", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bb434c2634d3cb60962fdc4a092cc6b4a10f641c Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 17:04:08 +0100 Subject: [PATCH 077/476] c9-auto-bump 3.1.1824 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a56218f..b7f23bd1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1823", + "version": "3.1.1824", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6dfb4c5445914ba2bde807d009f94d1006d36df0 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 16 Mar 2016 16:40:31 +0000 Subject: [PATCH 078/476] Propagate usertype & purpose on all events --- node_modules/c9/format-user-analytics.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/node_modules/c9/format-user-analytics.js b/node_modules/c9/format-user-analytics.js index d420e4d2..579975f1 100644 --- a/node_modules/c9/format-user-analytics.js +++ b/node_modules/c9/format-user-analytics.js @@ -23,7 +23,9 @@ define(function(require, exports, module) { name: user.fullname || user.name, pricingPlan: user.premium ? "Premium" : "Free", referredBy: user.referrer, - region: user.region + region: user.region, + usertype: user.usertype, + purpose: user.purpose, }; return traits; From 53a85fb44fe122e37c7bc5e62e60f76c323ed4cc Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 18:19:59 +0100 Subject: [PATCH 079/476] c9-auto-bump 3.1.1825 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b7f23bd1..74e4d6ea 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1824", + "version": "3.1.1825", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f1b80ef073cf72840926b9eacf7622df0643481b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 18:23:13 +0100 Subject: [PATCH 080/476] c9-auto-bump 3.1.1826 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 74e4d6ea..3b166b36 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1825", + "version": "3.1.1826", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5b502be0692d71e0f8e146bebbeb85004d2b5c0f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 19:08:29 +0100 Subject: [PATCH 081/476] c9-auto-bump 3.1.1827 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b166b36..dfdc26f1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1826", + "version": "3.1.1827", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4e278d09fe8c5ce71711d513ba3ca700ed8b0a3e Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 19:50:44 +0100 Subject: [PATCH 082/476] c9-auto-bump 3.1.1828 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 42abb017..2b89e500 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1827", + "version": "3.1.1828", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fc0a5380010835e289a0aff95f4ac889e48d954a Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 21:04:51 +0100 Subject: [PATCH 083/476] c9-auto-bump 3.1.1829 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b89e500..5ae628e2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1828", + "version": "3.1.1829", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5c9519d80843fe052424a663716dfd604c5e93ae Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 16 Mar 2016 22:12:22 +0100 Subject: [PATCH 084/476] c9-auto-bump 3.1.1830 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ae628e2..507ffea7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1829", + "version": "3.1.1830", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c3bc2f48304cbdaee5f4ad5a4b09dfc92011dcc0 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 09:45:31 +0100 Subject: [PATCH 085/476] c9-auto-bump 3.1.1831 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 507ffea7..c006b09c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1830", + "version": "3.1.1831", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d3a716cf1ab34f3d590faab624ca445d8929ca10 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 10:17:53 +0100 Subject: [PATCH 086/476] c9-auto-bump 3.1.1832 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c006b09c..f37e82c7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1831", + "version": "3.1.1832", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 04758300abf54195ca3e7537ed61eec92971bf6e Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 10:55:27 +0100 Subject: [PATCH 087/476] c9-auto-bump 3.1.1833 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f37e82c7..fac2a0dc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1832", + "version": "3.1.1833", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f36d7f89c23e215857610a06a7c211ede544fdd5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 11:09:57 +0100 Subject: [PATCH 088/476] c9-auto-bump 3.1.1834 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fac2a0dc..dee917c1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1833", + "version": "3.1.1834", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b8f4cedff6d658bdf3457f0782ee2436531daf55 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 11:13:45 +0100 Subject: [PATCH 089/476] c9-auto-bump 3.1.1835 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dee917c1..15ec0e57 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1834", + "version": "3.1.1835", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d042f18b52236b2891b8814d8abb6e41c07b9199 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:00:11 +0100 Subject: [PATCH 090/476] c9-auto-bump 3.1.1836 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15ec0e57..e3546f87 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1835", + "version": "3.1.1836", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7897d602c1303c5032b681613a3e9422c111c142 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:13:11 +0100 Subject: [PATCH 091/476] c9-auto-bump 3.1.1837 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3546f87..3ba8a6f4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1836", + "version": "3.1.1837", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2442369f52a898f73018b4d1c98241c1ca0545a8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:21:44 +0100 Subject: [PATCH 092/476] c9-auto-bump 3.1.1838 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ba8a6f4..b9b636c2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1837", + "version": "3.1.1838", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e7cf40416f92fbb4a4610c255708f61c3015937b Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:22:24 +0100 Subject: [PATCH 093/476] c9-auto-bump 3.1.1839 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b9b636c2..c828b0b8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1838", + "version": "3.1.1839", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 9baf5c98f48d9fd46874422be88b952cb0c27b78 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:25:33 +0100 Subject: [PATCH 094/476] c9-auto-bump 3.1.1840 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c828b0b8..28c6a3fd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1839", + "version": "3.1.1840", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 9577ee7cac5a017ab23ec65f5884ac19ec5d1acd Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:27:13 +0100 Subject: [PATCH 095/476] c9-auto-bump 3.1.1841 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28c6a3fd..d891b3dc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1840", + "version": "3.1.1841", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 72a22e1b0634d56f45de99f37f919a5e93f55c5d Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:30:46 +0100 Subject: [PATCH 096/476] c9-auto-bump 3.1.1842 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d891b3dc..90fcbceb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1841", + "version": "3.1.1842", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 77c895471ef23055c957f5cbdf4dff871029782a Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:32:35 +0100 Subject: [PATCH 097/476] c9-auto-bump 3.1.1843 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a06f56c3..bd70866d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1842", + "version": "3.1.1843", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 15525c0108f7ed6cbe562453d09c113b8f8bdd53 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:49:30 +0100 Subject: [PATCH 098/476] c9-auto-bump 3.1.1844 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd70866d..22971ec2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1843", + "version": "3.1.1844", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 847ef5362c4a5856dc03fc1881ad8bc9e26f2a0e Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:50:12 +0100 Subject: [PATCH 099/476] c9-auto-bump 3.1.1845 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22971ec2..f49865a1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1844", + "version": "3.1.1845", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ab6602e02ebe814f866731ae3427908e5a99fc8c Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:51:07 +0100 Subject: [PATCH 100/476] c9-auto-bump 3.1.1846 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f49865a1..ee056a95 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1845", + "version": "3.1.1846", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0367f4dd7e86dcd9948ae46f2dd0b607153f8ae7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 12:56:29 +0100 Subject: [PATCH 101/476] c9-auto-bump 3.1.1847 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee056a95..9bb915e6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1846", + "version": "3.1.1847", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1f4a7edb5813a4b5eb31b3ba95de4a7b2c5d2114 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 14:42:49 +0100 Subject: [PATCH 102/476] c9-auto-bump 3.1.1848 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9bb915e6..d3901493 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1847", + "version": "3.1.1848", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ac6e23f2dcf31a80a13ff4d800ff34dca28a8fa2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 15:06:57 +0100 Subject: [PATCH 103/476] c9-auto-bump 3.1.1849 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d3901493..fdf847ed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1848", + "version": "3.1.1849", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From cfa147c7025b7afef527718cb3d5cbdccf60b6a5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 15:21:42 +0100 Subject: [PATCH 104/476] c9-auto-bump 3.1.1850 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fdf847ed..770f8d76 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1849", + "version": "3.1.1850", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ea9bca529b4840ab5b7a63b867e734846ce45cbd Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 15:26:32 +0100 Subject: [PATCH 105/476] c9-auto-bump 3.1.1851 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 770f8d76..66f9df9a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1850", + "version": "3.1.1851", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c4bbc6c4410e587fd08f5e5709af17db5f0bafbc Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 15:50:20 +0100 Subject: [PATCH 106/476] c9-auto-bump 3.1.1852 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66f9df9a..0a472674 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1851", + "version": "3.1.1852", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a2826578184b69c8b9a08e27c0b4110d7a4895da Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 15:54:43 +0100 Subject: [PATCH 107/476] c9-auto-bump 3.1.1853 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a472674..98f2bd57 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1852", + "version": "3.1.1853", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2ba25a152fe0f98655dd0b2e11c531b700dc7d4d Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 19:53:48 +0100 Subject: [PATCH 108/476] c9-auto-bump 3.1.1854 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98f2bd57..c6121336 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1853", + "version": "3.1.1854", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c525202c8f1c217e23ba4a02d243f362efd6e289 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 21:42:52 +0100 Subject: [PATCH 109/476] c9-auto-bump 3.1.1855 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c6121336..e0e8f602 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1854", + "version": "3.1.1855", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 129a6e0d95f40e5496d3d8462b2a80191b11a756 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 22:44:08 +0100 Subject: [PATCH 110/476] c9-auto-bump 3.1.1856 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0e8f602..8112d120 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1855", + "version": "3.1.1856", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bff290622af0dc937332e1b6d7d633efe8e5d06d Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 22:56:57 +0100 Subject: [PATCH 111/476] c9-auto-bump 3.1.1857 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8112d120..1aec3e17 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1856", + "version": "3.1.1857", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3eb5c14b00e69fa8a591580f9b6ba3c6d5e22c40 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 17 Mar 2016 23:00:31 +0100 Subject: [PATCH 112/476] c9-auto-bump 3.1.1858 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1aec3e17..077579af 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1857", + "version": "3.1.1858", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0a478bf59f8ad010cc4e928f1529f0bb03bc9ecc Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 03:38:22 +0100 Subject: [PATCH 113/476] c9-auto-bump 3.1.1859 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 077579af..b9ce9b3d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1858", + "version": "3.1.1859", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7b3a42c0349b7361af30cb88b3a4fa9955d08421 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 03:59:46 +0100 Subject: [PATCH 114/476] c9-auto-bump 3.1.1860 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b9ce9b3d..daee975b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1859", + "version": "3.1.1860", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2d28aa7395b4143190c23dd5fa3f3b3a68167c5e Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 10:23:59 +0100 Subject: [PATCH 115/476] c9-auto-bump 3.1.1861 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index daee975b..b9f32c2f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1860", + "version": "3.1.1861", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 52d83387e848ee6169d6eac8260e3cc75fa7e652 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 10:40:11 +0100 Subject: [PATCH 116/476] c9-auto-bump 3.1.1862 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b9f32c2f..147becff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1861", + "version": "3.1.1862", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2f7f57b2ae5131e5c7f3d3cc78fc2c89a6d65515 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 10:53:33 +0100 Subject: [PATCH 117/476] c9-auto-bump 3.1.1863 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 147becff..22b8aef5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1862", + "version": "3.1.1863", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 9566307056de4a466fe40548f3c0418776a0da68 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 10:54:54 +0100 Subject: [PATCH 118/476] c9-auto-bump 3.1.1864 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22b8aef5..538b8bac 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1863", + "version": "3.1.1864", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c88ceeba14ede506c4f2dffb53b94023ce82dfba Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 10:55:50 +0100 Subject: [PATCH 119/476] c9-auto-bump 3.1.1865 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 538b8bac..3e0d9639 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1864", + "version": "3.1.1865", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e2779d073775b08544c0ecd6cecefed435bb5770 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 11:24:57 +0100 Subject: [PATCH 120/476] c9-auto-bump 3.1.1866 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e0d9639..0d6b08fa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1865", + "version": "3.1.1866", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a87a65a66e0736032c7fd62c672d69223f0b9c44 Mon Sep 17 00:00:00 2001 From: "Lennart C. L. Kats" Date: Fri, 18 Mar 2016 11:25:16 +0100 Subject: [PATCH 121/476] Add comment --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d9d34b5..a10fe075 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#56cf2d0032", + "c9.ide.language.codeintel": "#871d8e5e5d", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From ed5c90e7c88356dae7a17ec06eaf96e642308d1b Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 11:28:25 +0100 Subject: [PATCH 122/476] c9-auto-bump 3.1.1867 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d6b08fa..967d2f8c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1866", + "version": "3.1.1867", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c0d398121b7624703059df23aa9416173f47019a Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 11:46:04 +0100 Subject: [PATCH 123/476] c9-auto-bump 3.1.1868 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 967d2f8c..3fc91800 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1867", + "version": "3.1.1868", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6773eac828eb0d9b0a3850a29bc425ebf609dffc Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 12:33:29 +0100 Subject: [PATCH 124/476] c9-auto-bump 3.1.1869 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3fc91800..ce3d8edf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1868", + "version": "3.1.1869", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2d891fb3372681edcacc66df136f12b0273fb3d3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 12:37:37 +0100 Subject: [PATCH 125/476] c9-auto-bump 3.1.1870 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ce3d8edf..e15d376c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1869", + "version": "3.1.1870", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d4354eef34d7e21ff345f0032d11b75e50368d8b Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 13:43:44 +0100 Subject: [PATCH 126/476] c9-auto-bump 3.1.1871 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e15d376c..f34e1277 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1870", + "version": "3.1.1871", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2ec2a1278261d9cce5765db7cd25a03cc5e4460e Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 14:06:36 +0100 Subject: [PATCH 127/476] c9-auto-bump 3.1.1872 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f34e1277..4759962a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1871", + "version": "3.1.1872", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 89cec15c998b784167500d3b601fceba72c5b888 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 14:07:33 +0100 Subject: [PATCH 128/476] c9-auto-bump 3.1.1873 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4759962a..1c0d11c8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1872", + "version": "3.1.1873", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7cfa2ec649e7f98b72f60e8081fe902718a08d60 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 15:53:00 +0100 Subject: [PATCH 129/476] c9-auto-bump 3.1.1874 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c0d11c8..eafc48cb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1873", + "version": "3.1.1874", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From dff70f4dd90a4e553c489ea83913885c7065fa03 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 16:04:38 +0100 Subject: [PATCH 130/476] c9-auto-bump 3.1.1875 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eafc48cb..87a1952f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1874", + "version": "3.1.1875", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4c32d3334f0ca0c046eda3ac61b787dc0240c25c Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 18 Mar 2016 16:10:04 +0100 Subject: [PATCH 131/476] c9-auto-bump 3.1.1876 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 87a1952f..8fd1346e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1875", + "version": "3.1.1876", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e4cc358b76b527d246a6e471e3141e552f7344f6 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Mon, 21 Mar 2016 09:04:48 +0000 Subject: [PATCH 132/476] Return if element doesn't exist --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8fd1346e..21790510 100644 --- a/package.json +++ b/package.json @@ -118,6 +118,6 @@ "c9.ide.undo": "#b028bcb4d5", "c9.ide.upload": "#0bd010d3dc", "c9.ide.welcome": "#5b86c44e92", - "c9.ide.guide": "#d2e406b5e3" + "c9.ide.guide": "#5eafce7709" } } \ No newline at end of file From cae251bdc79429c0456a58e9a0eb41aecd036fdf Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 21 Mar 2016 12:54:00 +0100 Subject: [PATCH 133/476] c9-auto-bump 3.1.1877 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8fd1346e..69455f3b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1876", + "version": "3.1.1877", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 72454779c6569fc4277ee7f135be8ef9602af868 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Mon, 21 Mar 2016 12:00:33 +0000 Subject: [PATCH 134/476] Change error page titles to generic codes --- plugins/c9.error/views/error-500.html.ejs | 2 +- plugins/c9.error/views/error-503.html.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.error/views/error-500.html.ejs b/plugins/c9.error/views/error-500.html.ejs index f833a5e0..7f35b547 100644 --- a/plugins/c9.error/views/error-500.html.ejs +++ b/plugins/c9.error/views/error-500.html.ejs @@ -1,7 +1,7 @@ - <%=error%> + 500 Internal Server Error diff --git a/plugins/c9.error/views/error-503.html.ejs b/plugins/c9.error/views/error-503.html.ejs index 86c37845..78c1ecfc 100644 --- a/plugins/c9.error/views/error-503.html.ejs +++ b/plugins/c9.error/views/error-503.html.ejs @@ -1,7 +1,7 @@ - <%=error%> + 503 Service Unavailable From 88c0b5d69a6602010da72891a695c605ef7d0d1b Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Mon, 21 Mar 2016 12:03:31 +0000 Subject: [PATCH 135/476] Add hyphens --- plugins/c9.error/views/error-500.html.ejs | 2 +- plugins/c9.error/views/error-503.html.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.error/views/error-500.html.ejs b/plugins/c9.error/views/error-500.html.ejs index 7f35b547..0495692d 100644 --- a/plugins/c9.error/views/error-500.html.ejs +++ b/plugins/c9.error/views/error-500.html.ejs @@ -1,7 +1,7 @@ - 500 Internal Server Error + 500 - Internal Server Error diff --git a/plugins/c9.error/views/error-503.html.ejs b/plugins/c9.error/views/error-503.html.ejs index 78c1ecfc..eb7394ba 100644 --- a/plugins/c9.error/views/error-503.html.ejs +++ b/plugins/c9.error/views/error-503.html.ejs @@ -1,7 +1,7 @@ - 503 Service Unavailable + 503 - Service Unavailable From 9231bfc96c16c86b11706ba8a8a38efdc45c7527 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Mon, 21 Mar 2016 10:25:25 -0400 Subject: [PATCH 136/476] Leave 500 as is --- plugins/c9.error/views/error-500.html.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.error/views/error-500.html.ejs b/plugins/c9.error/views/error-500.html.ejs index 0495692d..f833a5e0 100644 --- a/plugins/c9.error/views/error-500.html.ejs +++ b/plugins/c9.error/views/error-500.html.ejs @@ -1,7 +1,7 @@ - 500 - Internal Server Error + <%=error%> From 5d6584fe05e844169160e36819791b41689dc5d0 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 21 Mar 2016 15:30:27 +0100 Subject: [PATCH 137/476] c9-auto-bump 3.1.1878 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c82a2b9..ca4f6e0c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1877", + "version": "3.1.1878", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 28d1868d3810f792d92a270f476e9fac497c01d9 Mon Sep 17 00:00:00 2001 From: Matthijs van Henten Date: Mon, 21 Mar 2016 14:49:41 +0000 Subject: [PATCH 138/476] creates a not-found util --- node_modules/c9/is-notfound.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 node_modules/c9/is-notfound.js diff --git a/node_modules/c9/is-notfound.js b/node_modules/c9/is-notfound.js new file mode 100644 index 00000000..dcc8edba --- /dev/null +++ b/node_modules/c9/is-notfound.js @@ -0,0 +1,7 @@ +"use strict"; + + +module.exports = function isNotFound(err) { + if (err && err.code === 404) return true; + return false; +}; \ No newline at end of file From 498547fa47a198dd2107bdf0d9882781b5a0dc26 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Mon, 21 Mar 2016 15:12:06 +0000 Subject: [PATCH 139/476] Fix 2 guide errors in CS50 workspace --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca4f6e0c..e3314d44 100644 --- a/package.json +++ b/package.json @@ -118,6 +118,6 @@ "c9.ide.undo": "#b028bcb4d5", "c9.ide.upload": "#0bd010d3dc", "c9.ide.welcome": "#5b86c44e92", - "c9.ide.guide": "#5eafce7709" + "c9.ide.guide": "#8ab966f344" } } \ No newline at end of file From c5a9d9e7dc950b621a49f21a43b500d849c2d157 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 21 Mar 2016 17:01:52 +0100 Subject: [PATCH 140/476] c9-auto-bump 3.1.1879 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca4f6e0c..e2df1840 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1878", + "version": "3.1.1879", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b10d32c604f8806d241d663500292df57e9ba5a7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 21 Mar 2016 21:53:45 +0100 Subject: [PATCH 141/476] c9-auto-bump 3.1.1880 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e2df1840..2b57a7bf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1879", + "version": "3.1.1880", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e50a8569ecea0623437cca39d5442401b9d7179d Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 21 Mar 2016 22:37:28 +0100 Subject: [PATCH 142/476] c9-auto-bump 3.1.1881 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b57a7bf..5efdff35 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1880", + "version": "3.1.1881", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2fcabfeef13d9beb7bdc8ef4071a81d530aa531d Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 21 Mar 2016 22:38:52 +0100 Subject: [PATCH 143/476] c9-auto-bump 3.1.1882 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5efdff35..0bde99c3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1881", + "version": "3.1.1882", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 20ba080ad6ef3af88eecaf6df820c0310a684335 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 21 Mar 2016 22:52:08 +0100 Subject: [PATCH 144/476] c9-auto-bump 3.1.1883 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bde99c3..7a2f37f2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1882", + "version": "3.1.1883", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ef3d86c7f1fcfeb514e89b604ddc504c72f919ac Mon Sep 17 00:00:00 2001 From: Rob Moran Date: Wed, 16 Mar 2016 21:16:01 +0000 Subject: [PATCH 145/476] Added CLI exec command --- configs/cli.js | 4 ++ plugins/c9.cli.bridge/bridge_commands.js | 12 +++- plugins/c9.cli.exec/exec.js | 92 ++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 plugins/c9.cli.exec/exec.js diff --git a/configs/cli.js b/configs/cli.js index 80a8d3f5..e3fd3411 100644 --- a/configs/cli.js +++ b/configs/cli.js @@ -80,6 +80,10 @@ return [ packagePath: "./c9.cli.open/open", platform: process.platform }, + { + packagePath: "./c9.cli.exec/exec", + platform: process.platform + }, { packagePath: "./c9.cli.open/restart", platform: process.platform diff --git a/plugins/c9.cli.bridge/bridge_commands.js b/plugins/c9.cli.bridge/bridge_commands.js index 5e697a0a..f078cece 100644 --- a/plugins/c9.cli.bridge/bridge_commands.js +++ b/plugins/c9.cli.bridge/bridge_commands.js @@ -2,7 +2,7 @@ define(function(require, exports, module) { main.consumes = [ "Plugin", "bridge", "tabManager", "panels", "tree.favorites", "tree", - "fs", "preferences", "settings", "c9" + "fs", "preferences", "settings", "c9", "commands" ]; main.provides = ["bridge.commands"]; return main; @@ -18,6 +18,7 @@ define(function(require, exports, module) { var fs = imports.fs; var c9 = imports.c9; var prefs = imports.preferences; + var commands = imports.commands; var async = require("async"); @@ -36,6 +37,9 @@ define(function(require, exports, module) { case "open": open(message, e.respond); break; + case "exec": + exec(message, e.respond); + break; case "pipe": createPipe(message, e.respond); break; @@ -173,6 +177,12 @@ define(function(require, exports, module) { callback(null, true); }); } + + function exec(message, callback) { + var result = commands.exec(message.command, message.args); + var err = result ? null : "command failed"; + callback(err, result); + } /***** Lifecycle *****/ diff --git a/plugins/c9.cli.exec/exec.js b/plugins/c9.cli.exec/exec.js new file mode 100644 index 00000000..e8a48f4b --- /dev/null +++ b/plugins/c9.cli.exec/exec.js @@ -0,0 +1,92 @@ +define(function(require, exports, module) { + main.consumes = ["Plugin", "cli_commands", "bridge.client"]; + main.provides = ["exec"]; + return main; + + function main(options, imports, register) { + var Plugin = imports.Plugin; + var cmd = imports.cli_commands; + var bridge = imports["bridge.client"]; + + /***** Initialization *****/ + + var plugin = new Plugin("Ajax.org", main.consumes); + // var emit = plugin.getEmitter(); + + var loaded; + function load(){ + if (loaded) return; + loaded = true; + + cmd.addCommand({ + name: "exec", + info: " Executes remote c9 commands.", + usage: " [argument 1] [argument 2] ... [argument n]", + check: function(argv) { + if (argv._.length < 2) + throw new Error("Missing command"); + }, + options: {}, + exec: function(argv) { + exec( + argv._[1], + argv._.slice(2), + function(){}); + } + }); + } + + /***** Methods *****/ + + function exec(command, args, callback) { + args.unshift(process.cwd()); + var message = { + type: "exec", + command: command, + args: args + }; + + bridge.send(message, function cb(err, response) { + if (err) { + console.log(err.message); + } + + if (response !== true) + console.log("Could not execute", command); + + process.exit(); // I don't get why this is needed + }); + } + + /***** Lifecycle *****/ + + plugin.on("load", function(){ + load(); + }); + plugin.on("enable", function(){ + + }); + plugin.on("disable", function(){ + + }); + plugin.on("unload", function(){ + loaded = false; + }); + + /***** Register and define API *****/ + + /** + * Finds or lists files and/or lines based on their filename or contents + **/ + plugin.freezePublicAPI({ + /** + * + */ + exec: exec + }); + + register(null, { + exec: plugin + }); + } +}); \ No newline at end of file From 5a4788d7e17021e244ff974d93a9edc35cbdd54e Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 22 Mar 2016 00:09:38 +0400 Subject: [PATCH 146/476] better handling for golang in gdb debugger --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a2f37f2..57edc81b 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", "c9.ide.find.replace": "#8cbce45290", - "c9.ide.run.debug": "#286975f644", + "c9.ide.run.debug": "#8970f5d3cc", "c9.automate": "#47e2c429c9", "c9.ide.ace.emmet": "#6dc4585e02", "c9.ide.ace.gotoline": "#a8ff07c8f4", From b1caa2fbf68f885032aed51a05ae1d489e36738b Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 22 Mar 2016 00:10:18 +0400 Subject: [PATCH 147/476] fix insertmode in libterm --- plugins/c9.ide.terminal/aceterm/libterm.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.ide.terminal/aceterm/libterm.js b/plugins/c9.ide.terminal/aceterm/libterm.js index 4f30c487..c19e8656 100644 --- a/plugins/c9.ide.terminal/aceterm/libterm.js +++ b/plugins/c9.ide.terminal/aceterm/libterm.js @@ -470,7 +470,7 @@ Terminal.prototype.writeInternal = function(data) {//TODO optimize lines if (!this.insertMode) line[this.x] = [this.curAttr, ch]; else - line[insertY].splice(this.x, 0, [this.curAttr, ch]); + line.splice(this.x, 0, [this.curAttr, ch]); break; case 0: if (this.x > 0) this.x--; @@ -481,7 +481,7 @@ Terminal.prototype.writeInternal = function(data) {//TODO optimize lines line[this.x] = [this.curAttr, ch]; line[this.x + 1] = [this.curAttr, "\x00"]; } else { - line[insertY].splice(this.x, 0, [this.curAttr, ch], [this.curAttr, ""]); + line.splice(this.x, 0, [this.curAttr, ch], [this.curAttr, ""]); } this.x++; break; From 92a7b393001918031074f4976e9d114a8b6d4d15 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 22 Mar 2016 01:11:56 +0400 Subject: [PATCH 148/476] make exit code logging more robust --- node_modules/vfs-local/localfs.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js index 0eba62a4..dcad436c 100644 --- a/node_modules/vfs-local/localfs.js +++ b/node_modules/vfs-local/localfs.js @@ -1827,9 +1827,11 @@ module.exports = function setup(fsOptions) { } else if (options.command) { args.push(BASH + " -l -c '" - + options.command.replace(/'/g, "'\\''") - + '; printf "\\e[01;30m\\n\\nProcess exited with code: $?\\e[0m\\n"' - + "; sleep 0.1;'"); + + ( + 'trap \'printf "\\e[01;30m\\n\\nProcess exited with code: $?\\e[0m\\n"\' EXIT\n' + + options.command + ).replace(/'/g, "'\\''") + + "'"); } args.push( From 9cb0f0a2f11ed906175e38169b42cc6b11df561a Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 21 Mar 2016 23:11:54 +0100 Subject: [PATCH 149/476] c9-auto-bump 3.1.1884 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 57edc81b..87af2e04 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1883", + "version": "3.1.1884", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4424d391957f6edb91cb5b076a33dd7a53531ca2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 21 Mar 2016 23:12:10 +0100 Subject: [PATCH 150/476] c9-auto-bump 3.1.1885 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 87af2e04..423b9a0c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1884", + "version": "3.1.1885", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 40d8c3c7c14cf8651cb2aa71dd57141afe28b1ed Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 00:07:26 +0100 Subject: [PATCH 151/476] c9-auto-bump 3.1.1886 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb159538..2faf3535 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1885", + "version": "3.1.1886", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 17eb7561e9f4fd2643b95e8822ee039a97e532ec Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 22 Mar 2016 01:24:51 +0000 Subject: [PATCH 152/476] fix typo --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2faf3535..c2d8a81e 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", "c9.ide.find.replace": "#8cbce45290", - "c9.ide.run.debug": "#8970f5d3cc", + "c9.ide.run.debug": "#7d6da73fc7", "c9.automate": "#47e2c429c9", "c9.ide.ace.emmet": "#6dc4585e02", "c9.ide.ace.gotoline": "#a8ff07c8f4", From c8a4af97ef92dcd06a728562c0717d4a48a99765 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 02:25:54 +0100 Subject: [PATCH 153/476] c9-auto-bump 3.1.1887 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c2d8a81e..6d633226 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1886", + "version": "3.1.1887", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d2c698e3d5047add03bea716245e572b978cd1b7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 09:42:22 +0100 Subject: [PATCH 154/476] c9-auto-bump 3.1.1888 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d633226..bf295031 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1887", + "version": "3.1.1888", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4fae8f958ac60edec0395cca411140c4719bd012 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 10:08:33 +0100 Subject: [PATCH 155/476] c9-auto-bump 3.1.1889 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf295031..f99f0bc3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1888", + "version": "3.1.1889", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4b14590dbd2b293f3f9862776903ce300a8cbdee Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 10:15:32 +0100 Subject: [PATCH 156/476] c9-auto-bump 3.1.1890 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f99f0bc3..f4212b12 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1889", + "version": "3.1.1890", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3141fa62dd3d2c9a3b65d7abdf793892cfeb63b6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 10:38:43 +0100 Subject: [PATCH 157/476] c9-auto-bump 3.1.1891 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f4212b12..f7f02981 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1890", + "version": "3.1.1891", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ddbe64046cff61b4bd641e63cf9cc8a6faec2b7d Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 22 Mar 2016 11:49:55 +0000 Subject: [PATCH 158/476] Fix +12972 meta.stream is falsy --- node_modules/vfs-socket/worker.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/node_modules/vfs-socket/worker.js b/node_modules/vfs-socket/worker.js index fbf197a3..8cf0d3f4 100644 --- a/node_modules/vfs-socket/worker.js +++ b/node_modules/vfs-socket/worker.js @@ -437,6 +437,8 @@ function Worker(vfs) { var keys = Object.keys(meta || {}); for (var i = 0, l = keys.length; i < l; i++) { var key = keys[i]; + if (!meta[key]) + continue; switch (key) { case "stream": token.stream = storeStream(meta.stream); break; case "process": token.process = storeProcess(meta.process); break; From f2208d858b42f6e0887a337c508628c1f4515c42 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Mon, 21 Mar 2016 14:38:40 +0000 Subject: [PATCH 159/476] Fix makestatic --- scripts/makestatic.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/makestatic.js b/scripts/makestatic.js index 92238a73..7290f44c 100755 --- a/scripts/makestatic.js +++ b/scripts/makestatic.js @@ -85,7 +85,8 @@ function main(config, settings, options, callback) { findAllAndPurge: function(maxVfsAge, callback) { callback(null, [{}]); } - } + }, + "User": {} }, "redis": {}, "health": { From e1027a3874f80a0586053ed0bcee5ebdef7db536 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 13:12:10 +0100 Subject: [PATCH 160/476] c9-auto-bump 3.1.1892 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7f02981..e5bddc17 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1891", + "version": "3.1.1892", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d9ec3482d155da90ac84f1f20bf811bb1be5ac79 Mon Sep 17 00:00:00 2001 From: Matthijs van Henten Date: Tue, 22 Mar 2016 14:36:53 +0100 Subject: [PATCH 161/476] Revert "Refactor clone api" --- node_modules/c9/is-notfound.js | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 node_modules/c9/is-notfound.js diff --git a/node_modules/c9/is-notfound.js b/node_modules/c9/is-notfound.js deleted file mode 100644 index dcc8edba..00000000 --- a/node_modules/c9/is-notfound.js +++ /dev/null @@ -1,7 +0,0 @@ -"use strict"; - - -module.exports = function isNotFound(err) { - if (err && err.code === 404) return true; - return false; -}; \ No newline at end of file From 77acdaff4e15c2da4e1c329b095a4ba3630f4c68 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 14:37:13 +0100 Subject: [PATCH 162/476] c9-auto-bump 3.1.1893 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5bddc17..17cf81a6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1892", + "version": "3.1.1893", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4304c32540d7130b20c989e3dee42d7a97fda2a6 Mon Sep 17 00:00:00 2001 From: Matthijs van Henten Date: Tue, 22 Mar 2016 14:40:52 +0100 Subject: [PATCH 163/476] Revert "Revert "Refactor clone api"" --- node_modules/c9/is-notfound.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 node_modules/c9/is-notfound.js diff --git a/node_modules/c9/is-notfound.js b/node_modules/c9/is-notfound.js new file mode 100644 index 00000000..dcc8edba --- /dev/null +++ b/node_modules/c9/is-notfound.js @@ -0,0 +1,7 @@ +"use strict"; + + +module.exports = function isNotFound(err) { + if (err && err.code === 404) return true; + return false; +}; \ No newline at end of file From 0dd73dc50bd43be6a068680bda8de09594c956ee Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 14:57:10 +0100 Subject: [PATCH 164/476] c9-auto-bump 3.1.1894 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17cf81a6..88ddacfc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1893", + "version": "3.1.1894", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e9e6a63147c59ee6fb37aa7acae164ba915f22e9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 14:57:54 +0100 Subject: [PATCH 165/476] c9-auto-bump 3.1.1895 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 88ddacfc..aa9ba4bc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1894", + "version": "3.1.1895", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 27a1e5896d6402e516de6ae42f410d65c95cbad9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 15:17:42 +0100 Subject: [PATCH 166/476] c9-auto-bump 3.1.1896 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aa9ba4bc..6bcc3c9f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1895", + "version": "3.1.1896", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8eea16b8fb086a0f739cae5e113fa14e7fa1e2aa Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 15:32:32 +0100 Subject: [PATCH 167/476] c9-auto-bump 3.1.1897 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6bcc3c9f..8c0b1f7c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1896", + "version": "3.1.1897", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f351e30e1a6085c00d6c4d4795dadcf1d00ebcfb Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 15:37:27 +0100 Subject: [PATCH 168/476] c9-auto-bump 3.1.1898 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c0b1f7c..ee464566 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1897", + "version": "3.1.1898", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6aef3697da01f59fd1ded1b94c2ef495b832870c Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 16:12:06 +0100 Subject: [PATCH 169/476] c9-auto-bump 3.1.1899 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee464566..9bdad03e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1898", + "version": "3.1.1899", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8ad61cd46ec9cdd48a3b87f706130580bbb721ff Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 16:25:59 +0100 Subject: [PATCH 170/476] c9-auto-bump 3.1.1900 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9bdad03e..e94c6c28 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1899", + "version": "3.1.1900", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ac531ec206fa12c46e9a8297fbde65ae1439e64f Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 16:35:07 +0100 Subject: [PATCH 171/476] c9-auto-bump 3.1.1901 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e94c6c28..e72f9c3d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1900", + "version": "3.1.1901", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ff367cf1073eeb184980fe1dc403545085707f7f Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 16:51:09 +0100 Subject: [PATCH 172/476] c9-auto-bump 3.1.1902 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e72f9c3d..e62c4f7d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1901", + "version": "3.1.1902", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 42248eb81e5dc2117f6dd2c33c329f5620036832 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Tue, 22 Mar 2016 16:55:57 +0100 Subject: [PATCH 173/476] Update CODING_STANDARDS.md --- docs/CODING_STANDARDS.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/CODING_STANDARDS.md b/docs/CODING_STANDARDS.md index 6a6eea2d..4f935434 100644 --- a/docs/CODING_STANDARDS.md +++ b/docs/CODING_STANDARDS.md @@ -695,6 +695,17 @@ API Documentation All classes and public API should be documented using [JSDuck annotations](https://github.com/senchalabs/jsduck). +Branch Naming +------------- + +We follow the uni-repo approach so our source is in one place. To work around some of the issues - for example looking at all PRs affecting a certain service - we prefix branches with the name of the service(s) the branch affects. + + PR branch names, e.g. “api-”, “ide-”, “multi-ide-vfs-sapi-”. + +Checking for branch naming consistency is part of the review process and the teams responsibility. + + Use “all-” in case of doubt. E.g., https://github.com/c9/newclient/pull/12962/files affects redis schema code. + Other Resources =============== From 6b1c373d4dd5075f1f68ffaa394e39843c2b5dd1 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Tue, 22 Mar 2016 16:59:00 +0100 Subject: [PATCH 174/476] Update CODING_STANDARDS.md --- docs/CODING_STANDARDS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/CODING_STANDARDS.md b/docs/CODING_STANDARDS.md index 4f935434..e6b83592 100644 --- a/docs/CODING_STANDARDS.md +++ b/docs/CODING_STANDARDS.md @@ -705,6 +705,8 @@ We follow the uni-repo approach so our source is in one place. To work around so Checking for branch naming consistency is part of the review process and the teams responsibility. Use “all-” in case of doubt. E.g., https://github.com/c9/newclient/pull/12962/files affects redis schema code. + +In case of doubt use `all-` as this indicates higher risk. Generally releasing changes affecting several services is a smell so this can help you identify possible issue. Other Resources =============== From 9985c86a72ab9776f9962ac36d577b151ed9af4e Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Tue, 22 Mar 2016 16:59:47 +0100 Subject: [PATCH 175/476] Update CODING_STANDARDS.md --- docs/CODING_STANDARDS.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/CODING_STANDARDS.md b/docs/CODING_STANDARDS.md index e6b83592..c3d89f8d 100644 --- a/docs/CODING_STANDARDS.md +++ b/docs/CODING_STANDARDS.md @@ -700,13 +700,15 @@ Branch Naming We follow the uni-repo approach so our source is in one place. To work around some of the issues - for example looking at all PRs affecting a certain service - we prefix branches with the name of the service(s) the branch affects. - PR branch names, e.g. “api-”, “ide-”, “multi-ide-vfs-sapi-”. +PR branch names, e.g. + + “api-”, “ide-”, “multi-ide-vfs-sapi-” Checking for branch naming consistency is part of the review process and the teams responsibility. Use “all-” in case of doubt. E.g., https://github.com/c9/newclient/pull/12962/files affects redis schema code. -In case of doubt use `all-` as this indicates higher risk. Generally releasing changes affecting several services is a smell so this can help you identify possible issue. +Generally releasing changes affecting several services is a smell so this can help you identify possible issues. Other Resources =============== From 45a006acdf0486dde32091ec34d04baf30ea70f8 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Tue, 22 Mar 2016 17:00:12 +0100 Subject: [PATCH 176/476] Update CODING_STANDARDS.md --- docs/CODING_STANDARDS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CODING_STANDARDS.md b/docs/CODING_STANDARDS.md index c3d89f8d..987a7a6b 100644 --- a/docs/CODING_STANDARDS.md +++ b/docs/CODING_STANDARDS.md @@ -698,7 +698,7 @@ All classes and public API should be documented using [JSDuck annotations](https Branch Naming ------------- -We follow the uni-repo approach so our source is in one place. To work around some of the issues - for example looking at all PRs affecting a certain service - we prefix branches with the name of the service(s) the branch affects. +We follow the uni-repo approach so our source code is in one place. To work around some of the issues - for example looking at all PRs affecting a certain service - we prefix branches with the name of the service(s) the branch affects. PR branch names, e.g. From 93642f27d9a3ea157de9caab83757cc94c4e4b69 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Tue, 22 Mar 2016 17:00:29 +0100 Subject: [PATCH 177/476] Update CODING_STANDARDS.md --- docs/CODING_STANDARDS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/CODING_STANDARDS.md b/docs/CODING_STANDARDS.md index 987a7a6b..de0b82bf 100644 --- a/docs/CODING_STANDARDS.md +++ b/docs/CODING_STANDARDS.md @@ -12,7 +12,7 @@ Goals Base ---- -* [http://nodeguide.com/style.html]([http://nodeguide.com/style.html) +* [http://nodeguide.com/sGtyle.html]([http://nodeguide.com/style.html) * [https://github.com/ajaxorg/apf/blob/master/CODING_STANDARDS](https://github.com/ajaxorg/apf/blob/master/CODING_STANDARDS) @@ -708,7 +708,7 @@ Checking for branch naming consistency is part of the review process and the tea Use “all-” in case of doubt. E.g., https://github.com/c9/newclient/pull/12962/files affects redis schema code. -Generally releasing changes affecting several services is a smell so this can help you identify possible issues. +Generally, releasing changes affecting several services is a smell so this can help you identify possible issues. Other Resources =============== From afc9d82f398ef8bf63ccc1d3d565d862b2eea3c7 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Tue, 22 Mar 2016 17:00:47 +0100 Subject: [PATCH 178/476] Update CODING_STANDARDS.md --- docs/CODING_STANDARDS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CODING_STANDARDS.md b/docs/CODING_STANDARDS.md index de0b82bf..6d2e9221 100644 --- a/docs/CODING_STANDARDS.md +++ b/docs/CODING_STANDARDS.md @@ -12,7 +12,7 @@ Goals Base ---- -* [http://nodeguide.com/sGtyle.html]([http://nodeguide.com/style.html) +* [http://nodeguide.com/style.html]([http://nodeguide.com/style.html) * [https://github.com/ajaxorg/apf/blob/master/CODING_STANDARDS](https://github.com/ajaxorg/apf/blob/master/CODING_STANDARDS) From c6b7ac9b83ef8a0e630fe9052b1116dae1942b56 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Tue, 22 Mar 2016 16:05:47 +0000 Subject: [PATCH 179/476] Add commit style --- docs/CODING_STANDARDS.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/CODING_STANDARDS.md b/docs/CODING_STANDARDS.md index 6d2e9221..25bc3028 100644 --- a/docs/CODING_STANDARDS.md +++ b/docs/CODING_STANDARDS.md @@ -695,6 +695,12 @@ API Documentation All classes and public API should be documented using [JSDuck annotations](https://github.com/senchalabs/jsduck). +Commit messages +--------------- + +We try to adhere to https://github.com/blog/926-shiny-new-commit-styles and to a lesser extent http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html. +Don't write `I fixed a bug` or `Fixed bug`, or even `Added a cool fix for bug`. Just write `Fix bug in wrop wraffles` or `Add feature flip floppers`, present tense. + Branch Naming ------------- From 81835166a4c6b05981423153b8f1440f9211747f Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 17:14:13 +0100 Subject: [PATCH 180/476] c9-auto-bump 3.1.1903 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e62c4f7d..3d1ffc0d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1902", + "version": "3.1.1903", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 79c33bc6921e82d58954f37662527fe3e82f5f7b Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Tue, 22 Mar 2016 16:21:14 +0000 Subject: [PATCH 181/476] Add example --- docs/CODING_STANDARDS.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/CODING_STANDARDS.md b/docs/CODING_STANDARDS.md index 25bc3028..8318a955 100644 --- a/docs/CODING_STANDARDS.md +++ b/docs/CODING_STANDARDS.md @@ -716,6 +716,10 @@ Checking for branch naming consistency is part of the review process and the tea Generally, releasing changes affecting several services is a smell so this can help you identify possible issues. +You can now look for all PRs which made it in like so (api in this case): + + git log --oneline --first-parent SHA..origin/master | grep -v bump | grep api- + Other Resources =============== From 8a254ecb484ea0a1b7998a8cb61b05f06daa26b0 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 17:22:01 +0100 Subject: [PATCH 182/476] c9-auto-bump 3.1.1904 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d1ffc0d..bccdf04b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1903", + "version": "3.1.1904", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 17b43a1185f18629b81f69575f1779fed1033d03 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 17:23:52 +0100 Subject: [PATCH 183/476] c9-auto-bump 3.1.1905 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bccdf04b..c63fda01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1904", + "version": "3.1.1905", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 92eee2317df26e41d352964dd773882639d48c0f Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 18:27:33 +0100 Subject: [PATCH 184/476] c9-auto-bump 3.1.1906 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c63fda01..ef1f49ed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1905", + "version": "3.1.1906", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5524f19dfc7641f41a1cbf73cf669dd9367f4154 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 18:54:29 +0100 Subject: [PATCH 185/476] c9-auto-bump 3.1.1907 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef1f49ed..03c3f283 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1906", + "version": "3.1.1907", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 296526a991a15a6eb6759e50fa09bb83b9575894 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 19:19:08 +0100 Subject: [PATCH 186/476] c9-auto-bump 3.1.1908 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03c3f283..9d3aa274 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1907", + "version": "3.1.1908", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b146caca12e6ef6ac49e98541d8b8a642a3dbaa7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 20:05:25 +0100 Subject: [PATCH 187/476] c9-auto-bump 3.1.1909 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d3aa274..bb4ba2ed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1908", + "version": "3.1.1909", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e04aaa26d133d94047e7d236a73a750e5d4bf834 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 21:10:51 +0100 Subject: [PATCH 188/476] c9-auto-bump 3.1.1910 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bb4ba2ed..f5a31d8d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1909", + "version": "3.1.1910", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a610c171de5d9cac2e19e6ed858ea4f981ef58b4 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 21:36:29 +0100 Subject: [PATCH 189/476] c9-auto-bump 3.1.1911 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f5a31d8d..f16ef1b7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1910", + "version": "3.1.1911", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d7ffcbfbceeab0cee5a678b62fdcc39fe43c04dd Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 22 Mar 2016 23:02:11 +0100 Subject: [PATCH 190/476] c9-auto-bump 3.1.1912 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f16ef1b7..faca8984 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1911", + "version": "3.1.1912", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 163317312b19720ba1a4532eea1a16461495261f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 08:09:24 +0100 Subject: [PATCH 191/476] c9-auto-bump 3.1.1913 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index faca8984..c77e7c48 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1912", + "version": "3.1.1913", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 60668d14cd341760283c5f7d352a9f6f11f4a740 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 08:10:28 +0100 Subject: [PATCH 192/476] c9-auto-bump 3.1.1914 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c77e7c48..40df55c9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1913", + "version": "3.1.1914", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 179ce9668d14e1f5c4b9b8288aa1fe93738bb33e Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 09:09:34 +0100 Subject: [PATCH 193/476] c9-auto-bump 3.1.1915 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40df55c9..943e9be3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1914", + "version": "3.1.1915", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 15f5cbbf53b9730f3fc43956360bf32b6a0c26c2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 09:18:13 +0100 Subject: [PATCH 194/476] c9-auto-bump 3.1.1916 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 943e9be3..8588c020 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1915", + "version": "3.1.1916", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ad1cea1b149924a4b4768024e1a739eaa8b3ab1f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 09:43:33 +0100 Subject: [PATCH 195/476] c9-auto-bump 3.1.1917 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8588c020..c206ff40 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1916", + "version": "3.1.1917", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5c0abe122de8467ef2350adfa4bcd3a002cd9050 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 09:49:21 +0100 Subject: [PATCH 196/476] c9-auto-bump 3.1.1918 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c206ff40..d36df68a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1917", + "version": "3.1.1918", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4500f7bbe0537d1eaeb1ffdb5dd82a7beaf41d59 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 09:50:19 +0100 Subject: [PATCH 197/476] c9-auto-bump 3.1.1919 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d36df68a..27c22194 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1918", + "version": "3.1.1919", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f1bf9e2506ba60ad0ed6c759e9f8666ceede3b1a Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 09:51:19 +0100 Subject: [PATCH 198/476] c9-auto-bump 3.1.1920 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27c22194..5640ade0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1919", + "version": "3.1.1920", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c1147c068e45749c22effb98ef7b95ab5b251da3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 10:52:58 +0100 Subject: [PATCH 199/476] c9-auto-bump 3.1.1921 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5640ade0..0b956d07 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1920", + "version": "3.1.1921", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 94d2b280df5341b7d5e4e7c6c35bd109a76b103f Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 23 Mar 2016 10:27:53 +0000 Subject: [PATCH 200/476] Improve rest_client timeout behavior --- node_modules/c9/rest_client.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/node_modules/c9/rest_client.js b/node_modules/c9/rest_client.js index 8f42b1d0..931843b4 100644 --- a/node_modules/c9/rest_client.js +++ b/node_modules/c9/rest_client.js @@ -44,7 +44,11 @@ function RestClient(host, port, config) { port: port, path: path, method: method, - headers: headers + headers: headers, + timeout: config.timeout || 60 * 1000, + pool: config.pool || { + maxSockets: 100000 + } }; if (config.username) options.auth = config.username + ":" + config.password; @@ -141,4 +145,4 @@ function RestClient(host, port, config) { } } -module.exports = RestClient; +module.exports = RestClient; \ No newline at end of file From 6eb17e12f9eaa46c93fdd8fb7edcd288024d2cd5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 11:50:52 +0100 Subject: [PATCH 201/476] c9-auto-bump 3.1.1922 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b956d07..a75f2e4a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1921", + "version": "3.1.1922", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 22f777e40849b90b0111a86638c678e826d2e3c8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 12:14:05 +0100 Subject: [PATCH 202/476] c9-auto-bump 3.1.1923 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a75f2e4a..033685c4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1922", + "version": "3.1.1923", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a0fce8b789b75a8655690c589b2b4bd579e18767 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 13:22:41 +0100 Subject: [PATCH 203/476] c9-auto-bump 3.1.1924 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 033685c4..b3888b13 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1923", + "version": "3.1.1924", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4519d99819d9355732450e3b777e80497845ec45 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 13:32:07 +0100 Subject: [PATCH 204/476] c9-auto-bump 3.1.1925 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3888b13..d243e987 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1924", + "version": "3.1.1925", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 400fe03237e846fb6a7f0fd245c161e9a07f6a9f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 13:33:45 +0100 Subject: [PATCH 205/476] c9-auto-bump 3.1.1926 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d243e987..f4801d7b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1925", + "version": "3.1.1926", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 04b58c2168dd6a9e2d0bd1275c45e999a6e4d48b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 13:34:18 +0100 Subject: [PATCH 206/476] c9-auto-bump 3.1.1927 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f4801d7b..1f450eff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1926", + "version": "3.1.1927", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ff33f20f3ed5de08d2ac839cb2c334b109b77c2f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 13:40:48 +0100 Subject: [PATCH 207/476] c9-auto-bump 3.1.1928 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f450eff..763222ac 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1927", + "version": "3.1.1928", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6b586078e32f4327478dbf685c96e3d50a660a15 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 13:49:31 +0100 Subject: [PATCH 208/476] c9-auto-bump 3.1.1929 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 763222ac..bd998bee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1928", + "version": "3.1.1929", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 075b4d7a946ac45c3fcde133744173c2e6d8e53c Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 14:36:32 +0100 Subject: [PATCH 209/476] c9-auto-bump 3.1.1930 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd998bee..4b41e763 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1929", + "version": "3.1.1930", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d59976d67c2cb4252619a06df118a07edd80cee7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 17:29:59 +0100 Subject: [PATCH 210/476] c9-auto-bump 3.1.1931 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b41e763..63abf945 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1930", + "version": "3.1.1931", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c2149c9172fb2138c386ee12a500f7c8b8955d76 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 17:30:58 +0100 Subject: [PATCH 211/476] c9-auto-bump 3.1.1932 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 63abf945..b9072577 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1931", + "version": "3.1.1932", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 78877d85ac1effe581998c5cc8c59869c1af1fcb Mon Sep 17 00:00:00 2001 From: Dana Date: Wed, 23 Mar 2016 16:34:08 +0000 Subject: [PATCH 212/476] Remove Runner Started Event --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b41e763..b2d4330a 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "c9.ide.recentfiles": "#7c099abf40", "c9.ide.remote": "#301d2ab519", "c9.ide.processlist": "#2b12cd1bdd", - "c9.ide.run": "#485f06bd22", + "c9.ide.run": "#6bd4996a4e", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", From f8ee462be9babc50b3662a7b243d640e46bf0bce Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 18:04:41 +0100 Subject: [PATCH 213/476] c9-auto-bump 3.1.1933 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b9072577..5f7a76db 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1932", + "version": "3.1.1933", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 01ef4c89ffaaf9e0cb1a871121651e475e9c4937 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 21:32:46 +0100 Subject: [PATCH 214/476] c9-auto-bump 3.1.1934 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5f7a76db..98eb1076 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1933", + "version": "3.1.1934", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From eda785365340b1e138c45503202017479bd1240f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 21:37:04 +0100 Subject: [PATCH 215/476] c9-auto-bump 3.1.1935 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98eb1076..76c01b56 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1934", + "version": "3.1.1935", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3bd283567d234c3c19f4ebc2dfaae59812fa176c Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 21:44:13 +0100 Subject: [PATCH 216/476] c9-auto-bump 3.1.1936 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76c01b56..15986776 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1935", + "version": "3.1.1936", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0e51251a0b9d84e874dd87a3d8211fc7bebb67a5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Mar 2016 22:10:15 +0100 Subject: [PATCH 217/476] c9-auto-bump 3.1.1937 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15986776..20f29244 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1936", + "version": "3.1.1937", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b94acc77246af34e3d8be12ecc4f92f640118cc8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 09:53:17 +0100 Subject: [PATCH 218/476] c9-auto-bump 3.1.1938 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 20f29244..f8606456 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1937", + "version": "3.1.1938", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f855dca7604a7cc9aedd5a6ee817ede5f00c6fcd Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 09:55:24 +0100 Subject: [PATCH 219/476] c9-auto-bump 3.1.1939 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f8606456..ca26cd01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1938", + "version": "3.1.1939", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6d3036110d24c76538a7fe508cf919ad7c354c08 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 10:00:43 +0100 Subject: [PATCH 220/476] c9-auto-bump 3.1.1940 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca26cd01..a5d64f1e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1939", + "version": "3.1.1940", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0e61de8d270c3cecc4f436a07374442aee85c39a Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 10:25:41 +0100 Subject: [PATCH 221/476] c9-auto-bump 3.1.1941 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5d64f1e..2f59038e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1940", + "version": "3.1.1941", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f8c91dae0f4e8088afff7fd3808893be63702507 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 10:27:30 +0100 Subject: [PATCH 222/476] c9-auto-bump 3.1.1942 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f59038e..2a5e4e86 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1941", + "version": "3.1.1942", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 12581d287b95a6a3832f5fd439342d9c5f32a9c6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 11:07:59 +0100 Subject: [PATCH 223/476] c9-auto-bump 3.1.1943 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 574732a0..4ac7fffd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1942", + "version": "3.1.1943", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 75c0188016c0a3fd1787e55757b7247f02ddd86e Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 11:12:41 +0100 Subject: [PATCH 224/476] c9-auto-bump 3.1.1944 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ac7fffd..bc86143b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1943", + "version": "3.1.1944", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3bf6743b027eaebe1880b796a15b9d9cf45b0147 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 11:13:42 +0100 Subject: [PATCH 225/476] c9-auto-bump 3.1.1945 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc86143b..507d76c7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1944", + "version": "3.1.1945", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c3a59262e713e3ae2a6d1f3d705204badec779ad Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 11:26:48 +0100 Subject: [PATCH 226/476] c9-auto-bump 3.1.1946 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 507d76c7..83d76447 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1945", + "version": "3.1.1946", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From febcab349135151bcd85eee515820423d7cfef64 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 11:29:26 +0100 Subject: [PATCH 227/476] c9-auto-bump 3.1.1947 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 83d76447..8642b950 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1946", + "version": "3.1.1947", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e184e88c9e21e6d887d9176c61900a9ac2dd7cc2 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 24 Mar 2016 10:45:48 +0000 Subject: [PATCH 228/476] address review comments --- plugins/c9.vfs.client/endpoint.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/c9.vfs.client/endpoint.js b/plugins/c9.vfs.client/endpoint.js index c90ff5e3..24ad4b9f 100644 --- a/plugins/c9.vfs.client/endpoint.js +++ b/plugins/c9.vfs.client/endpoint.js @@ -251,6 +251,13 @@ define(function(require, exports, module) { }, 10000); return; } + else if (err.code == 503) { + // service unavailable + setTimeout(function() { + tryNext(i); + }, res.error.retryIn || 15000); + return; + } else if (err.code === 500 && res && res.error && res.error.cause) { return callback(res.error.cause.message); } From a5be0ab7097eb6217263471dbb1d25401101f46d Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 13:43:31 +0100 Subject: [PATCH 229/476] c9-auto-bump 3.1.1948 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e006cd2e..7f444f12 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1947", + "version": "3.1.1948", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4221a9d2e5b1d9ca5ab238390be5366ebdb5e782 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 14:27:59 +0100 Subject: [PATCH 230/476] c9-auto-bump 3.1.1949 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f444f12..1b2f4d31 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1948", + "version": "3.1.1949", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 725245858d4a54999496fbea243782b146ec6e76 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 15:07:59 +0100 Subject: [PATCH 231/476] c9-auto-bump 3.1.1950 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b2f4d31..5caeab1e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1949", + "version": "3.1.1950", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c157ebb22a662ab572aa49ae05c60d6e1e84a821 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 15:31:10 +0100 Subject: [PATCH 232/476] c9-auto-bump 3.1.1951 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5caeab1e..66cc009a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1950", + "version": "3.1.1951", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 29a936976d753bd0ac8f54b3bacfa2cf3ad91d38 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 16:12:34 +0100 Subject: [PATCH 233/476] c9-auto-bump 3.1.1952 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66cc009a..efb334f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1951", + "version": "3.1.1952", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e704fd54885f9c7f20d04ed6058ff4ebcaf4f635 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 16:41:16 +0100 Subject: [PATCH 234/476] c9-auto-bump 3.1.1953 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index efb334f3..64abbe2f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1952", + "version": "3.1.1953", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 57b9d2cfa8885f1cffc969cbcd08d8de5bc741af Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 16:45:35 +0100 Subject: [PATCH 235/476] c9-auto-bump 3.1.1954 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 64abbe2f..ba0755ad 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1953", + "version": "3.1.1954", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d1838ce9a9b4412138041df5a5be2b9e1b729060 Mon Sep 17 00:00:00 2001 From: Nikolai Onken Date: Thu, 24 Mar 2016 17:43:13 +0000 Subject: [PATCH 236/476] Set raygun to not be clever on non [object Error] objects --- plugins/c9.error/raygun.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.error/raygun.js b/plugins/c9.error/raygun.js index 6a51ce0b..ca753d4a 100644 --- a/plugins/c9.error/raygun.js +++ b/plugins/c9.error/raygun.js @@ -25,8 +25,8 @@ function plugin(options, imports, register) { }; var clients = { - error: new raygun.Client().init({ apiKey: options.keys.error }), - warning: new raygun.Client().init({ apiKey: options.keys.warning }) + error: new raygun.Client().init({ apiKey: options.keys.error, useHumanStringForObject: false }), + warning: new raygun.Client().init({ apiKey: options.keys.warning, useHumanStringForObject: false }) }; var customClients = options.customClients || {}; From b00a9750bb462004ad1d1ca5d23f4cca90a08a99 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 18:50:06 +0100 Subject: [PATCH 237/476] c9-auto-bump 3.1.1955 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba0755ad..2242cb91 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1954", + "version": "3.1.1955", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 78f2824cc3bd075d21f63933d7b6583bbf52f898 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 24 Mar 2016 19:51:21 +0000 Subject: [PATCH 238/476] Port rest_client extension from +13004 --- node_modules/c9/rest_client.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/node_modules/c9/rest_client.js b/node_modules/c9/rest_client.js index 8f42b1d0..8631edf5 100644 --- a/node_modules/c9/rest_client.js +++ b/node_modules/c9/rest_client.js @@ -44,7 +44,11 @@ function RestClient(host, port, config) { port: port, path: path, method: method, - headers: headers + headers: headers, + timeout: config.timeout || 60 * 1000, + pool: config.pool || { + maxSockets: 100000, + }, }; if (config.username) options.auth = config.username + ":" + config.password; From 826dce94f60dc874477dfcf45ccc17d3317fe688 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 24 Mar 2016 20:33:50 +0000 Subject: [PATCH 239/476] Show error when workspace ceases to exist --- plugins/c9.ide.dialog.common/alert_internal.js | 2 ++ plugins/c9.vfs.client/endpoint.js | 4 ++++ plugins/c9.vfs.client/vfs_client.js | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/c9.ide.dialog.common/alert_internal.js b/plugins/c9.ide.dialog.common/alert_internal.js index 572c48ad..042b3277 100644 --- a/plugins/c9.ide.dialog.common/alert_internal.js +++ b/plugins/c9.ide.dialog.common/alert_internal.js @@ -42,6 +42,8 @@ define(function(require, module, exports) { .replace(/\n/g, "
") .replace(/(https?:\/\/[^\s]*\b)/g, "$1"); + plugin.getElement("ok").setCaption(options.yes || "OK"); + plugin.update([ { id: "dontshow", visible: options && options.showDontShow } ]); diff --git a/plugins/c9.vfs.client/endpoint.js b/plugins/c9.vfs.client/endpoint.js index c90ff5e3..59197dc9 100644 --- a/plugins/c9.vfs.client/endpoint.js +++ b/plugins/c9.vfs.client/endpoint.js @@ -225,6 +225,10 @@ define(function(require, exports, module) { callback(fatalError(res.error.message, "dashboard")); return; } + else if (err.code == 404) { + callback(fatalError("This workspace no longer appears to exist or failed to be created.", "dashboard")); + return; + } else if (err.code === 428 && res.error) { emit("restore", { projectState: res.error.projectState, diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js index 9e11a4d0..0f07d9b4 100644 --- a/plugins/c9.vfs.client/vfs_client.js +++ b/plugins/c9.vfs.client/vfs_client.js @@ -253,7 +253,7 @@ define(function(require, exports, module) { err.message = "SSH permission denied. Please review your workspace configuration."; return showAlert("Workspace Error", "Unable to access your workspace", err.message, function() { window.location = dashboardUrl; - }); + }, { yes: "Return to dashboard" }); case "reload": lastError = showError(err.message + ". Please reload this window.", -1); setTimeout(function() { From ff9e4776f8cc03fbe7392c2cdb0d1d92ecb19a90 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 24 Mar 2016 22:13:53 +0100 Subject: [PATCH 240/476] c9-auto-bump 3.1.1956 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2242cb91..e71aeefc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1955", + "version": "3.1.1956", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 65fd1b7c473054e2e77b17caf1c8e88973697909 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 24 Mar 2016 21:37:33 +0000 Subject: [PATCH 241/476] correct highlighting for bash config files --- plugins/c9.ide.ace/ace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.ace/ace.js b/plugins/c9.ide.ace/ace.js index ff712657..b2da9718 100644 --- a/plugins/c9.ide.ace/ace.js +++ b/plugins/c9.ide.ace/ace.js @@ -1444,7 +1444,7 @@ define(function(require, exports, module) { else if (/^{/.test(firstLine)) { syntax = "json"; } - else if (/\.(bashrc|inputrc)$/.test(path)) { + else if (/\.(bash|inputrc|profile|zsh)/.test(path)) { syntax = "sh"; } else if (/\.(git(attributes|config|ignore)|npmrc)$/.test(path)) { From 1e3b0058f5c00d0dfa055612706bf2ac74f8d651 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 24 Mar 2016 22:39:44 +0000 Subject: [PATCH 242/476] fix share dialog displaying wrong error message --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba0755ad..c81ec7db 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#871d8e5e5d", - "c9.ide.collab": "#11a0d3c5ce", + "c9.ide.collab": "#19b04b331b", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", From b59d55d0e80d715db6fdf2861dfcb36a817c0af6 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 24 Mar 2016 22:40:35 +0000 Subject: [PATCH 243/476] fix raygun error --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c81ec7db..f41556a2 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#871d8e5e5d", - "c9.ide.collab": "#19b04b331b", + "c9.ide.collab": "#7d3d49fa8e", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", From ab69dc8d239ad96b93520795a24777222d0a72f9 Mon Sep 17 00:00:00 2001 From: nightwing Date: Fri, 25 Mar 2016 01:37:23 +0000 Subject: [PATCH 244/476] tweak plugin installer --- package.json | 2 +- plugins/c9.cli.publish/publish.js | 4 ++++ plugins/c9.core/ext.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f41556a2..5398748e 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.help.support": "#af5c4055b2", "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#19758abe08", - "c9.ide.installer": "#0fde9f0067", + "c9.ide.installer": "#cad8f8316d", "c9.ide.language.python": "#330b80e3b2", "c9.ide.language.go": "#6ce1c7a7ef", "c9.ide.mount": "#4c39359b87", diff --git a/plugins/c9.cli.publish/publish.js b/plugins/c9.cli.publish/publish.js index d3efede7..3c8551c9 100644 --- a/plugins/c9.cli.publish/publish.js +++ b/plugins/c9.cli.publish/publish.js @@ -653,6 +653,10 @@ define(function(require, exports, module) { p = "/" + normalizePath(Path.relative(cwd, p)); excludeMap[p] = 1; }); + // keep installer in both packed and unpacked form + if (json.installer) + excludeMap["/" + normalizePath(Path.relative(cwd, json.installer))] = 0; + copy(cwd, cwd + "/.c9/.build", { exclude: function(name, parent) { if (excludeRe.test(name)) diff --git a/plugins/c9.core/ext.js b/plugins/c9.core/ext.js index d8a1e866..5768c28a 100644 --- a/plugins/c9.core/ext.js +++ b/plugins/c9.core/ext.js @@ -577,7 +577,7 @@ define(function(require, exports, module) { function setAPIKey(apikey){ // Validate Key - if (!apikey || !apikey.match(/[\w+]{27}=/)) + if (!apikey || !apikey.match(/^.{27}=$/)) throw new Error("Invalid API key"); return { From 279ac222f3a27a9b819382b385044bb67be5a65d Mon Sep 17 00:00:00 2001 From: Dana Date: Fri, 25 Mar 2016 10:26:01 +0000 Subject: [PATCH 245/476] Add augment checking for errors in Raygun --- plugins/c9.error/raygun.connect.js | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/c9.error/raygun.connect.js b/plugins/c9.error/raygun.connect.js index 512be225..922eae90 100644 --- a/plugins/c9.error/raygun.connect.js +++ b/plugins/c9.error/raygun.connect.js @@ -90,6 +90,7 @@ function plugin(options, imports, register) { var customData = _.clone(raygun.customData || {}); if (req.user) { customData.user = { + augment: err.augment, id: req.user.id, name: req.user.name, email: req.user.email From 9a6dcf2f1bb47672ccfe1b5e7e732916e66f0dc1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Mar 2016 12:04:53 +0100 Subject: [PATCH 246/476] c9-auto-bump 3.1.1957 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e71aeefc..ef27d9a2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1956", + "version": "3.1.1957", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From de53fe385bd9e192dcb836ad155f3a3d83eebba6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Mar 2016 12:36:16 +0100 Subject: [PATCH 247/476] c9-auto-bump 3.1.1958 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef27d9a2..a9ed4797 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1957", + "version": "3.1.1958", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c656e9adeabb675e301ade7e8fb88aec0ffb2a3a Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Mar 2016 13:25:36 +0100 Subject: [PATCH 248/476] c9-auto-bump 3.1.1959 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a9ed4797..eabe5c2a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1958", + "version": "3.1.1959", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From aa762bada39223b3e1ec06ee8ff4a9c28d052425 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Mar 2016 13:57:14 +0100 Subject: [PATCH 249/476] c9-auto-bump 3.1.1960 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eabe5c2a..728ec4e2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1959", + "version": "3.1.1960", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From cd9d3a7bf09eb2a82613cf0b2f94d2c1f866bfa8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Mar 2016 15:49:16 +0100 Subject: [PATCH 250/476] c9-auto-bump 3.1.1961 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0886e20f..9d5b5d78 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1960", + "version": "3.1.1961", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 9ceb03b36b8992a0b59e592eb9263bb3ed80493f Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Mar 2016 15:50:13 +0100 Subject: [PATCH 251/476] c9-auto-bump 3.1.1962 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d5b5d78..fc9133b2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1961", + "version": "3.1.1962", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4a2ec89e3d5f4a9e30677ab908adcb5809b9f3cd Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Mar 2016 16:50:57 +0100 Subject: [PATCH 252/476] c9-auto-bump 3.1.1963 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc9133b2..d251fc5e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1962", + "version": "3.1.1963", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0e5f9df9a00e4e4d8e87eb73dac9e7379b7977e4 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 25 Mar 2016 17:39:15 +0100 Subject: [PATCH 253/476] c9-auto-bump 3.1.1964 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d251fc5e..4a0c0942 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1963", + "version": "3.1.1964", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6862b66d214827bc72c182b7b05aad75f3fc3d89 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 1 Mar 2016 10:06:30 +0000 Subject: [PATCH 254/476] fix trimTrailingSpace on save with multiple cursors --- node_modules/ace/lib/ace/ext/whitespace.js | 20 +++-- .../ace/lib/ace/ext/whitespace_test.js | 76 ++++++++++++++++++- 2 files changed, 89 insertions(+), 7 deletions(-) diff --git a/node_modules/ace/lib/ace/ext/whitespace.js b/node_modules/ace/lib/ace/ext/whitespace.js index 7f39b092..aa20c60a 100644 --- a/node_modules/ace/lib/ace/ext/whitespace.js +++ b/node_modules/ace/lib/ace/ext/whitespace.js @@ -127,10 +127,20 @@ exports.trimTrailingSpace = function(session, options) { var lines = doc.getAllLines(); var min = options && options.trimEmpty ? -1 : 0; - var cursors = session.selection.rangeCount - ? session.selection.ranges.map(function(x) { return x.cursor; }) - : [session.selection.getCursor()]; - var ci = options && options.keepCursorPosition ? 0 : -1; + var cursors = [], ci = -1; + if (options && options.keepCursorPosition) { + if (session.selection.rangeCount) { + session.selection.rangeList.ranges.forEach(function(x, i, ranges) { + var next = ranges[i + 1] + if (next && next.cursor.row == x.cursor.row) + return; + cursors.push(x.cursor); + }); + } else { + cursors.push(session.selection.getCursor()); + } + ci = 0; + } var cursorRow = cursors[ci] && cursors[ci].row; for (var i = 0, l=lines.length; i < l; i++) { @@ -139,7 +149,7 @@ exports.trimTrailingSpace = function(session, options) { if (i == cursorRow) { if (index < cursors[ci].column) - index = min; + index = cursors[ci].column; ci++; cursorRow = cursors[ci] ? cursors[ci].row : -1; } diff --git a/node_modules/ace/lib/ace/ext/whitespace_test.js b/node_modules/ace/lib/ace/ext/whitespace_test.js index 419ae74f..cddc52ea 100644 --- a/node_modules/ace/lib/ace/ext/whitespace_test.js +++ b/node_modules/ace/lib/ace/ext/whitespace_test.js @@ -1,13 +1,14 @@ if (typeof process !== "undefined") { require("amd-loader"); - require("../test/mockdom"); } define(function(require, exports, module) { "use strict"; +require("../multi_select"); var assert = require("assert"); var EditSession = require("../edit_session").EditSession; +var UndoManager = require("../undomanager").UndoManager; var whitespace = require("./whitespace"); // Execution ORDER: test.setUpSuite, setUp, testFn, tearDown, test.tearDownSuite @@ -111,8 +112,79 @@ module.exports = { assert.equal(indent.length, 1); next(); - } + }, + "test trimTrailingSpace": function(next) { + var session = new EditSession([ + "a", + "\t b \t", + " ", + "\t", + "\t\tx\t\t", + " ", + " " + ]); + session.setUndoManager(new UndoManager()); + + function testOne(value, options) { + console.log(JSON.stringify(session.getValue())) + + whitespace.trimTrailingSpace(session, options); + assert.equal(value, session.getValue()); + session.markUndoGroup(); + session.getUndoManager().undo(); + } + + testOne("a\n\t b\n \n\t\n\t\tx\n \n ") + + testOne("a\n\t b\n\n\n\t\tx\n\n", { + trimEmpty: true + }); + + session.selection.fromJSON([{ + start: {row:2,column:3}, + end: {row:4,column:4} + }]); + testOne("a\n\t b\n\n\n\t\tx\t\n\n", { + keepCursorPosition: true, + trimEmpty: true + }); + + session.selection.fromJSON([{ + start: {row:2,column:3}, + end: {row:4,column:4}, + isBackwards: true + }]); + testOne("a\n\t b\n \n\n\t\tx\n\n", { + keepCursorPosition: true, + trimEmpty: true + }); + + session.selection.$initRangeList(); + session.selection.fromJSON([{ + start: {row:2, column:3}, + end: {row:2,column:3} + }, { + start: {row:1, column:1}, + end: {row:1, column:1} + }, { + start: {row:2,column:2}, + end: {row:2,column:2} + }, { + start: {row:0,column:5}, + end: {row:0,column:5}, + isBackwards:false + }, { + start: {row:6,column:1}, + end: {row:6,column:1}, + isBackwards:false + }]); + testOne("a\n\t b\n \n\n\t\tx\n\n ", { + trimEmpty: true, + keepCursorPosition: true + }); + next(); + }, }; }); From 510a9ad77e4e42edd9380f532cdedf7d9560d200 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 27 Mar 2016 03:35:59 +0400 Subject: [PATCH 255/476] onYes/no are optional in question dialog --- plugins/c9.ide.dialog.common/question.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/c9.ide.dialog.common/question.js b/plugins/c9.ide.dialog.common/question.js index 7e3be92e..23d08df1 100644 --- a/plugins/c9.ide.dialog.common/question.js +++ b/plugins/c9.ide.dialog.common/question.js @@ -54,7 +54,7 @@ define(function(require, module, exports) { var gotYesNo = false; plugin.once("hide", function(){ - !gotYesNo && cancel && onNo(false, true, metadata); + !gotYesNo && cancel && onNo && onNo(false, true, metadata); }); plugin.update([ @@ -63,22 +63,22 @@ define(function(require, module, exports) { { id: "yestoall", visible: all, onclick: function(){ gotYesNo = true; plugin.hide(); - onYes(true, metadata); + onYes && onYes(true, metadata); }}, { id: "notoall", visible: all, onclick: function(){ gotYesNo = true; plugin.hide(); - onNo(true, false, metadata); + onNo && onNo(true, false, metadata); }}, { id: "yes", onclick: function(){ gotYesNo = true; plugin.hide(); - onYes(false, metadata); + onYes && onYes(false, metadata); }}, { id: "no", onclick: function(){ gotYesNo = true; plugin.hide(); - onNo(false, false, metadata); + onNo && onNo(false, false, metadata); }} ]); }, options.queue === false); From 5d03ef7e0d9db9f7393f114adb3cc21a4dd5f114 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 27 Mar 2016 03:39:37 +0400 Subject: [PATCH 256/476] fix typo in worker.unregister --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 033685c4..a18e732b 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#f03e5ca0c8", + "c9.ide.language": "#c060f2604d", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", From 498a9b072fc854899414dcf467f15267acd629b1 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sun, 27 Mar 2016 04:49:15 +0400 Subject: [PATCH 257/476] make file rename in the tree more robust --- node_modules/ace_tree/lib/ace_tree/edit.js | 25 ++++--- node_modules/vfs-local/localfs.js | 11 ++- plugins/c9.fs/fs.cache.xml.js | 26 ++++++-- plugins/c9.ide.tree/tree.js | 78 ++++++++++++++-------- plugins/c9.ide.ui/menus.js | 6 +- 5 files changed, 101 insertions(+), 45 deletions(-) diff --git a/node_modules/ace_tree/lib/ace_tree/edit.js b/node_modules/ace_tree/lib/ace_tree/edit.js index 4dcc71e4..9403bf76 100644 --- a/node_modules/ace_tree/lib/ace_tree/edit.js +++ b/node_modules/ace_tree/lib/ace_tree/edit.js @@ -157,11 +157,12 @@ var EditableTree = function(tree) { this.ace.commands.bindKeys({ "Esc": function(ace) { ace.treeEditor.endRename(true); - ace.treeEditor.tree.focus(); }, "Enter": function(ace) { ace.treeEditor.endRename(); - ace.treeEditor.tree.focus(); + }, + "ctrl-s|cmd-s": function(ace) { + ace.treeEditor.endRename(); }, "Tab": function(ace) { ace.treeEditor.editNext(1); @@ -249,17 +250,23 @@ var EditableTree = function(tree) { this._destroyEditor = function() { if (this.lastDomNode) { this.lastDomNode.style.color = ""; - this.lastDomNode + this.lastDomNode; } this.ace.off("blur", this._onBlur); this.tree.renderer.off("afterRender", this._onAfterRender); - this.ace.blur(); - this.ace.destroy(); - if (this.ace.wrapper.parentNode) - this.ace.wrapper.parentNode.removeChild(this.ace.wrapper); + var ace = this.ace; this.ace = null; + setTimeout(function() { + // doing this after timeout to allow rename event focus something else + var wasFocused = ace.isFocused(); + ace.destroy(); + if (ace.wrapper.parentNode) + ace.wrapper.parentNode.removeChild(ace.wrapper); + if (wasFocused) + this.tree.focus(); + }.bind(this)); }; this.findNextEditPoint = function(dir, node, col, keepColumn) { @@ -378,16 +385,18 @@ var EditableTree = function(tree) { var val = this.ace.getValue(); - this._destroyEditor(); if (!cancel && this.origVal !== val) { this.tree._emit("rename", { node: node, value: val, + oldValue: this.origVal, column: this.column }); this.tree.provider._signal("change"); } + + this._destroyEditor(); }; }).call(EditableTree.prototype); diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js index dcad436c..f4a0f290 100644 --- a/node_modules/vfs-local/localfs.js +++ b/node_modules/vfs-local/localfs.js @@ -1030,7 +1030,16 @@ module.exports = function setup(fsOptions) { if (!exists || options.overwrite || isSamePath) { // Rename the file fs.rename(frompath, topath, function (err) { - if (err) return callback(err); + if (err) { + if (err.code == 'ENOENT' && options.mkdirP != false) { + options.mkdirP = false; + return mkdirP(dir, {}, function(err) { + if (err) return callback(err); + rename(path, options, callback); + }); + } + return callback(err); + } // Rename metadata if (options.metadata !== false) { diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js index 34b693b2..bd9e1a70 100644 --- a/plugins/c9.fs/fs.cache.xml.js +++ b/plugins/c9.fs/fs.cache.xml.js @@ -295,14 +295,15 @@ define(function(require, exports, module) { // Validation var toNode = findNode(newPath); - deleteNode(node, true); - if (toNode) - deleteNode(toNode, true); - - createNode(newPath, null, node); // Move node - recurPathUpdate(node, oldPath, newPath); + if (!toNode) { + deleteNode(node, true); + createNode(newPath, null, node); // Move node + recurPathUpdate(node, oldPath, newPath); + } e.undo = function(){ + if (toNode) + return; if (!parent) { var tmpParent = node; while (node.parent && tmpParent.parent.status == "pending") @@ -318,6 +319,12 @@ define(function(require, exports, module) { recurPathUpdate(node, newPath, oldPath); }; e.confirm = function() { + if (toNode) { + deleteNode(toNode, true); + createNode(newPath, null, node); // Move node + recurPathUpdate(node, oldPath, newPath); + } + if (node.status === "predicted") node.status = "loaded"; }; @@ -894,7 +901,12 @@ define(function(require, exports, module) { * @param {Function} progress * @param {Function} done */ - loadNodes: loadNodes + loadNodes: loadNodes, + + /** + * @ignore + */ + isFileHidden: isFileHidden }); register(null, { diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js index f130e2b4..3ba6de42 100644 --- a/plugins/c9.ide.tree/tree.js +++ b/plugins/c9.ide.tree/tree.js @@ -3,7 +3,7 @@ define(function(require, exports, module) { "Panel", "c9", "util", "fs", "settings", "ui", "menus", "panels", "commands", "tabManager", "fs.cache", "watcher", "preferences", "clipboard", "dialog.alert", "dialog.fileremove", - "dialog.fileoverwrite", "dialog.error", "layout" + "dialog.fileoverwrite", "dialog.error", "layout", "dialog.question" ]; main.provides = ["tree"]; return main; @@ -24,6 +24,7 @@ define(function(require, exports, module) { var watcher = imports.watcher; var prefs = imports.preferences; var alert = imports["dialog.alert"].show; + var question = imports["dialog.question"].show; var fsCache = imports["fs.cache"]; var confirmRemove = imports["dialog.fileremove"].show; var confirmRename = imports["dialog.fileoverwrite"].show; @@ -34,7 +35,7 @@ define(function(require, exports, module) { var TreeEditor = require("ace_tree/edit"); var markup = require("text!./tree.xml"); - var basename = require("path").basename; + var join = require("path").join; var dirname = require("path").dirname; var staticPrefix = options.staticPrefix; @@ -52,7 +53,7 @@ define(function(require, exports, module) { }); var emit = plugin.getEmitter(); - var container, winFilesViewer; //UI elements + var container, winFilesViewer; // UI elements var showHideScrollPos, scrollTimer; var tree; @@ -454,11 +455,6 @@ define(function(require, exports, module) { changed = true; settings.save(); }, plugin); - - function abortNoStorage() { - if (!c9.has(c9.STORAGE)) - return false; - } // Rename tree.on("beforeRename", function(e) { @@ -479,34 +475,58 @@ define(function(require, exports, module) { } var node = e.node; - var name = e.value; + var name = e.value.trim(); // check for a path with the same name, which is not allowed to rename to: var path = node.path; - var newpath = path.replace(/[^\/]+$/, name); + var newpath = join(path, "..", name); // No point in renaming when the name is the same - if (basename(path) == name) + if (path == newpath) return; - - // Returning false from this function will cancel the rename. We do this - // when the name to which the file is to be renamed contains invalid - // characters - if (/[\\\/\n\r]/.test(name)) { - // todo is this still needed? + + var m = /([\0\\\n\r])/.exec(name) || c9.platform == "win32" && /([\\:*?"<>|])/.exec(name); + if (m) { showError( - "Could not rename to '" + ui.htmlentities(name) - + "'. Names can only contain alfanumeric characters, space, . (dot)" - + ", - and _ (underscore). Use the terminal to rename to other names." + "Invalid character '" + m[0] + "' in '" + name + "'" ); return false; } - fs.rename(path, newpath, {}, function(err, success) { }); + // renaming to hidden file can be confusing if one doesn't know about hidden files + if (fsCache.isFileHidden(newpath) && !settings.getBool("user/projecttree/@showhidden")) { + settings.set("user/projecttree/@showhidden", true); + changed = true; + fsCache.showHidden = true; + refresh(true, function(){}); + } - emit("rename", { path: newpath, oldpath: path }); + if (dirname(newpath) != dirname(path)) { + tree.edit.ace.blur(); // TODO this shouldn't be needed when apf focus works + question( + "Confirm move to a new folder", + "move '" + e.oldValue + "' to \n" + + "'" + dirname(newpath) + "'?", + "", + doRename + ); + } else { + doRename(); + } - return false; + function doRename() { + fs.rename(path, newpath, {}, function(err, success) { + if (err) { + var message = err.message; + if (err.code == "EEXIST") + message = "File " + path + " already exists."; + return showError(message); + } + if (dirname(newpath) != dirname(path)) + expandAndSelect(newpath); + }); + emit("rename", { path: newpath, oldpath: path }); + } }, plugin); // Context Menu @@ -977,7 +997,7 @@ define(function(require, exports, module) { } else { var node = fsCache.findNode(path); - if (node) //Otherwise orphan-append will pick it up + if (node) // Otherwise orphan-append will pick it up expandNode(node); } @@ -1051,8 +1071,6 @@ define(function(require, exports, module) { } }); - //c9.dispatchEvent("track_action", { type: "reloadtree" }); - loadProjectTree(false, function(err) { var expandedNodes = Object.keys(expandedList); expandedList = {}; @@ -1067,7 +1085,7 @@ define(function(require, exports, module) { callback(err); tree.provider.on("changeScrollTop", scrollHandler); - emit("refreshComplete") + emit("refreshComplete"); }); } @@ -1100,6 +1118,7 @@ define(function(require, exports, module) { function expandAndSelect(path_or_node) { var node = findNode(path_or_node); expand(node, function(){ + refreshing = false; tree.select(node); scrollToSelection(); }); @@ -1212,10 +1231,12 @@ define(function(require, exports, module) { } function select(path_or_node) { + refreshing = false; tree.select(findNode(path_or_node)); } function selectList(list) { + refreshing = false; tree.selection.setSelection(list.map(function(n) { return findNode(n); })); @@ -1293,6 +1314,9 @@ define(function(require, exports, module) { callback(err, data); }); + var node = fsCache.findNode(newpath, "expand"); + if (node) + expandAndSelect(node); }); } diff --git a/plugins/c9.ide.ui/menus.js b/plugins/c9.ide.ui/menus.js index 2db45cc9..1edc400f 100644 --- a/plugins/c9.ide.ui/menus.js +++ b/plugins/c9.ide.ui/menus.js @@ -947,8 +947,10 @@ define(function(require, exports, module) { } function show(x, y, type) { - if (type == "context") - y++; + if (type == "context") { + x += 2; + y += 2; + } lastCoords = { x : x, y : y }; aml.display(x, y); } From 88e7102df1d7865c7548ace54bd05d788eb4d4ad Mon Sep 17 00:00:00 2001 From: c9bot Date: Sun, 27 Mar 2016 18:39:04 +0200 Subject: [PATCH 258/476] c9-auto-bump 3.1.1965 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a0c0942..ece8752f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1964", + "version": "3.1.1965", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e31af3903243a2a2a4274f5a96e16a9bcd6ebab8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Sun, 27 Mar 2016 18:39:27 +0200 Subject: [PATCH 259/476] c9-auto-bump 3.1.1966 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ece8752f..1915f5e1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1965", + "version": "3.1.1966", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From aa2eaf0ff447617dbc1e34489aef186cd809bc98 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 28 Mar 2016 00:21:01 +0400 Subject: [PATCH 260/476] fix poor performance of fscache watcher handler --- plugins/c9.fs/fs.cache.xml.js | 198 +++++++++++++++++++--------------- 1 file changed, 113 insertions(+), 85 deletions(-) diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js index bd9e1a70..b3bc5b43 100644 --- a/plugins/c9.fs/fs.cache.xml.js +++ b/plugins/c9.fs/fs.cache.xml.js @@ -82,6 +82,9 @@ define(function(require, exports, module) { node.status = "pending"; return; } + var parentPath = e.path; + if (!parentPath.endsWith("/")) + parentPath += "/"; // update cache if (!node) { if (!showHidden && isFileHidden(e.path)) @@ -96,93 +99,112 @@ define(function(require, exports, module) { // Indicate this directory has been fully read model.setAttribute(node, "status", "loaded"); - var wasOpen = startUpdate(node); - node.children = null; - var existing = node.map || {}; - node.map = {}; - - // Fill Parent - var ondisk = {}, toAppend = []; + var ondisk = Object.create(null); + var toRemove = []; + var toCreate = []; + var orphanAppand = []; + var existing = node.map || (node.map = Object.create(null)); e.result[1].forEach(function(stat) { if (!stat.name || !showHidden && isFileHidden(stat.name)) return; - var name = stat.name; - var path = (e.path + "/" + name).replace("//", "/"); + var path = parentPath + name; ondisk[name] = 1; - // if (existing[name]) return; + + if (existing[name]) + updateNodeStat(path, stat, existing[name]); + else + toCreate.push(stat); + if (orphans[path]) { - toAppend.push(path); + if (existing[name]) + delete orphans[path]; + else + orphanAppand.push(path); } - createNode(path, stat, existing[name], true); }); - for (var name in existing) { - if (!ondisk[name]) { - // onreaddir can be called before copied nodes are written to disk - // in this case we don't want to lose "predicted" state - if (existing[name] && existing[name].status === "predicted") - node.map[name] = existing[name]; - else { - delete existing[name]; - - emit("remove", { - path: e.path + "/" + name, - node: existing[name], - parent: node - }); - } - } - } + Object.keys(existing).forEach(function(name) { + // onreaddir can be called before copied nodes are written to disk + // in this case we don't want to lose "predicted" state + if (existing[name] && existing[name].status === "predicted") + ondisk[name] = 1; + if (!ondisk[name]) + toRemove.push(name); + }); + + if (!toCreate.length && !toRemove.length && !orphanAppand.length) + return; + + var wasOpen = startUpdate(node); + node.children = null; + + // Fill Parent + toCreate.forEach(function(stat) { + createNode(parentPath + stat.name, stat, null, true); + }); + + toRemove.forEach(function(name) { + var currentNode = existing[name]; + delete existing[name]; + emit("remove", { + path: parentPath + name, + node: currentNode, + parent: node + }); + }); emit("readdir", { path : e.path, parent : node, orphan: orphan }); endUpdate(node, wasOpen); - toAppend.forEach(function(path) { + orphanAppand.forEach(function(path) { emit("orphan-append", {path: path}); }); } fs.on("afterReaddir", onreaddir, plugin); function onstat(e) { - var stat; + if (e.error) return; - if (!e.error) { - // update cache - var there = true; - var node = findNode(e.path); - var parent = findNode(dirname(e.path)); - - if (!showHidden && isFileHidden(e.path)) - return; + // update cache + var stat = e.result[1]; + + var there = true; + var node = findNode(e.path); + var parent = findNode(dirname(e.path)); + + if (!showHidden && isFileHidden(e.path)) + return; - if (!node) { - if (!parent) - return; - there = false; + if (!node) { + if (!parent) + return; + there = false; + } + + if (there != !!stat) { + if (there) { + if (!node.link) + deleteNode(node); } - - if (there != !!e.result[1]) { - if (there) { - if (!node.link) - deleteNode(node); - } - else { - stat = e.result[1]; - if (typeof stat != "object") - stat = null; - createNode(e.path, stat); - } - } - else if (there) { - stat = e.result[1]; + else { if (typeof stat != "object") stat = null; - createNode(e.path, stat, node); + createNode(e.path, stat); } } + else if (there) { + if (typeof stat != "object") + stat = null; + if (!stat && node) + return; + if (stat && node) + updateNodeStat(e.path, stat, node); + else + createNode(e.path, stat, node); + } } fs.on("afterStat", onstat, plugin); fs.on("afterReadFile", function(e) { @@ -518,14 +540,8 @@ define(function(require, exports, module) { updateNode = orphans[path]; delete orphans[path]; } - var original_stat; - if (stat && stat.link) { - original_stat = stat; - stat = stat.linkStat; - } var parts = path.split("/"); - var name = parts[parts.length - 1]; var node = model.root.map[parts[0] == "~" ? "~" : ""]; if (!node) { node = orphans[parts[0]]; @@ -544,7 +560,7 @@ define(function(require, exports, module) { var map = node.map; if (!map) { - map = node.map = {}; + map = node.map = Object.create(null); } parent = node; node = map[p]; @@ -571,8 +587,32 @@ define(function(require, exports, module) { node = {label: parts[parts.length - 1], path: path}; orphans[path] = node; } + + updateNodeStat(path, stat, node); + + node.children = null; + + if (!updating) { + if (!modified.length) + modified.push(parent); + var wasOpen = startUpdate(modified[0]); + modified.forEach(function(n) { + if (n != model.root) + n.children = null; + }); + endUpdate(modified[0], wasOpen); + } + model._signal("createNode", node); + return node; + } + + function updateNodeStat(path, stat, node) { node.path = path; - + var original_stat; + if (stat && stat.link) { + original_stat = stat; + stat = stat.linkStat; + } if (stat) { var isFolder = stat && /(directory|folder)$/.test(stat.mime); if (isFolder) { @@ -596,25 +636,13 @@ define(function(require, exports, module) { delete node.isFolder; } - if (node.isFolder && !node.map) - node.map = {}; - else if (!node.isFolder && node.map) + if (node.isFolder && !node.map) { + node.map = Object.create(null); + node.children = null; + } else if (!node.isFolder && node.map) { delete node.map; - - node.children = null; - - if (!updating) { - if (!modified.length) - modified.push(parent); - var wasOpen = startUpdate(modified[0]); - modified.forEach(function(n) { - if (n != model.root) - n.children = null; - }); - endUpdate(modified[0], wasOpen); + node.children = null; } - model._signal("createNode", node); - return node; } function deleteNode(node, silent) { @@ -677,7 +705,7 @@ define(function(require, exports, module) { map: {} }; var root = {}; - root.map = {}; + root.map = Object.create(null); root.map[""] = model.projectDir; model.setRoot(root); // fs.readdir("/", function(){}); From 19e5f7a8aadeb9b1a84bfdd09d4efa38c47530b3 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 28 Mar 2016 03:24:30 +0400 Subject: [PATCH 261/476] automatically expand single child directory chains --- .../ace_tree/lib/ace_tree/data_provider.js | 7 +--- plugins/c9.fs/fs.cache.xml.js | 1 + plugins/c9.ide.tree/tree.js | 37 ++++++++++++++----- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/node_modules/ace_tree/lib/ace_tree/data_provider.js b/node_modules/ace_tree/lib/ace_tree/data_provider.js index 4709fe1c..7e98b866 100644 --- a/node_modules/ace_tree/lib/ace_tree/data_provider.js +++ b/node_modules/ace_tree/lib/ace_tree/data_provider.js @@ -49,7 +49,7 @@ var DataProvider = function(root) { }; this.open = - this.expand = function(node, deep, silent, justLoaded) { + this.expand = function(node, deep, silent) { if (typeof deep != "number") deep = deep ? 100 : 0; if (!node) @@ -69,7 +69,7 @@ var DataProvider = function(root) { this.collapse(node, null, true); node.status = "loaded"; if (!err) - this.expand(node, null, false, true); + this.expand(node, null, false); }.bind(this)); this.setOpen(node, true); return; @@ -95,9 +95,6 @@ var DataProvider = function(root) { } } - if (justLoaded) - node.justLoaded = true; - this.rows = items.length; silent || this._signal("expand", node); }; diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js index b3bc5b43..0b64994c 100644 --- a/plugins/c9.fs/fs.cache.xml.js +++ b/plugins/c9.fs/fs.cache.xml.js @@ -95,6 +95,7 @@ define(function(require, exports, module) { orphans[e.path] = node; orphan = true; } + node.$lastReadT = Date.now(); // Indicate this directory has been fully read model.setAttribute(node, "status", "loaded"); diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js index 3ba6de42..5c89c149 100644 --- a/plugins/c9.ide.tree/tree.js +++ b/plugins/c9.ide.tree/tree.js @@ -405,15 +405,10 @@ define(function(require, exports, module) { emit("expand", { path: id }); - if (node.justLoaded) { - delete node.justLoaded; - return; - } - // Only save if we are not loading the tree if (!refreshing || loadedSettings != -1) { if (!node.isRoot) { - var refresh = !refreshing && node.status == "loaded"; + var refresh = !refreshing && node.status == "loaded" && Date.now() - node.$lastReadT > 500; watcher.watch(id, refresh); // watch children @@ -425,8 +420,10 @@ define(function(require, exports, module) { }); } - changed = true; - settings.save(); + if (!updateSingleDirectoryChain(true, node)) { + changed = true; + settings.save(); + } } }, plugin); @@ -452,10 +449,30 @@ define(function(require, exports, module) { }); } - changed = true; - settings.save(); + if (!updateSingleDirectoryChain(false, node)) { + changed = true; + settings.save(); + } }, plugin); + function updateSingleDirectoryChain(isExpand, node) { + if (!node.children || node.children.length !== 1) + return; + var child = node.children[0]; + if (!child || !child.isFolder || child.$depth > 0xff) + return; + + if (isExpand && !child.isOpen) { + expandNode(child); + return true; + } + else if (!isExpand && child.isOpen) { + updateSingleDirectoryChain(false, child); + delete expandedList[child.path]; + return true; + } + } + // Rename tree.on("beforeRename", function(e) { if (emit("beforeRename", e) === false) From ee57e15889e823f01f18638c6c79fa7c3c6c8d4a Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 28 Mar 2016 03:47:52 +0400 Subject: [PATCH 262/476] fix tests --- node_modules/ace_tree/lib/ace_tree/edit.js | 1 + plugins/c9.fs/fs.cache.xml.js | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/node_modules/ace_tree/lib/ace_tree/edit.js b/node_modules/ace_tree/lib/ace_tree/edit.js index 9403bf76..09bb8dfb 100644 --- a/node_modules/ace_tree/lib/ace_tree/edit.js +++ b/node_modules/ace_tree/lib/ace_tree/edit.js @@ -258,6 +258,7 @@ var EditableTree = function(tree) { var ace = this.ace; this.ace = null; + ace.renderer.freeze(); setTimeout(function() { // doing this after timeout to allow rename event focus something else var wasFocused = ace.isFocused(); diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js index 0b64994c..50e1e406 100644 --- a/plugins/c9.fs/fs.cache.xml.js +++ b/plugins/c9.fs/fs.cache.xml.js @@ -113,17 +113,16 @@ define(function(require, exports, module) { ondisk[name] = 1; + if (orphans[path]) { + if (existing[name]) + delete orphans[path]; + orphanAppand.push(path); + } + if (existing[name]) updateNodeStat(path, stat, existing[name]); else toCreate.push(stat); - - if (orphans[path]) { - if (existing[name]) - delete orphans[path]; - else - orphanAppand.push(path); - } }); Object.keys(existing).forEach(function(name) { From d30940dbaaa53f0bdc08f86ef8ff4e6161247b06 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Mar 2016 17:11:35 +0200 Subject: [PATCH 263/476] c9-auto-bump 3.1.1967 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1915f5e1..f7513dba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1966", + "version": "3.1.1967", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6c733ea09d84d793f7bda7a691fc262ba0fa8bcb Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Mar 2016 17:57:43 +0200 Subject: [PATCH 264/476] c9-auto-bump 3.1.1968 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7513dba..60c22d4f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1967", + "version": "3.1.1968", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fa6e8f4db71e88b748e9f7774257d8cf9ea9a3d9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Mar 2016 18:02:25 +0200 Subject: [PATCH 265/476] c9-auto-bump 3.1.1969 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 60c22d4f..b7dd8af4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1968", + "version": "3.1.1969", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 09b7d678d83f0d38550e47abb7d6c63600e86d00 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Mar 2016 18:03:05 +0200 Subject: [PATCH 266/476] c9-auto-bump 3.1.1970 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b7dd8af4..52511221 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1969", + "version": "3.1.1970", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3e88942f3fa4b8c9c48f691af78e6bb3d745cb19 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Mar 2016 18:19:54 +0200 Subject: [PATCH 267/476] c9-auto-bump 3.1.1971 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52511221..b15c8c59 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1970", + "version": "3.1.1971", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From dbd009ce52676dfcda11e4cd7ef632971048f3b7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 28 Mar 2016 21:37:29 +0200 Subject: [PATCH 268/476] c9-auto-bump 3.1.1972 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b15c8c59..a8b468cc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1971", + "version": "3.1.1972", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 81fe8edb8ac9cf209bc78b98374a9ca750c36042 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Mar 2016 01:05:36 +0400 Subject: [PATCH 269/476] add support for folder upload on firefox --- package.json | 2 +- plugins/c9.ide.tree/tree.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a18e732b..e22a6b0c 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "c9.ide.theme.flat": "#81dadeee55", "c9.ide.threewaymerge": "#229382aa0b", "c9.ide.undo": "#b028bcb4d5", - "c9.ide.upload": "#0bd010d3dc", + "c9.ide.upload": "#a3da59803d", "c9.ide.welcome": "#5b86c44e92", "c9.ide.guide": "#8ab966f344" } diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js index 5c89c149..5a5e23ed 100644 --- a/plugins/c9.ide.tree/tree.js +++ b/plugins/c9.ide.tree/tree.js @@ -1082,6 +1082,8 @@ define(function(require, exports, module) { if (typeof node == "string") node = fsCache.findNode(node, "refresh"); + if (node && !node.isFolder) + node = node.parent; if (node && node.status === "loaded") { tree.provider.setAttribute(node, "status", "pending"); node.children = null; From 8e6a46e7490e896dabbc93e73297224f7c571f3a Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Mar 2016 01:17:40 +0400 Subject: [PATCH 270/476] fix issue with hidden files getting shown sometimes --- plugins/c9.fs/fs.cache.xml.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js index 50e1e406..7922f9a0 100644 --- a/plugins/c9.fs/fs.cache.xml.js +++ b/plugins/c9.fs/fs.cache.xml.js @@ -568,6 +568,11 @@ define(function(require, exports, module) { modified.push(parent); if (i !== parts.length - 1) { node = {label: p, path: subPath, status: "pending", isFolder: true}; + // TODO filter hidden files in getChildren instead. + if (!showHidden && isFileHidden(p)) { + orphans[node.path] = path; + return; + } } else if (updateNode) { deleteNode(updateNode, true); node = updateNode; From 512ed8827f602b5bca6b352df433d278365232cf Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Tue, 29 Mar 2016 11:16:18 +0000 Subject: [PATCH 271/476] Remove some framework globals --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 32b9e87d..6197ae50 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", "c9.ide.language.html.diff": "#24f3608d26", - "c9.ide.language.javascript": "#d1a479805c", + "c9.ide.language.javascript": "#038c0904af", "c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.eslint": "#3c57ed1720", "c9.ide.language.javascript.tern": "#b55d0069bb", From 10e573c6e1a512af72bfb5cca8e3687241ae7151 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 29 Mar 2016 11:22:47 +0000 Subject: [PATCH 272/476] Print the error --- plugins/c9.error/error_handler.js | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/c9.error/error_handler.js b/plugins/c9.error/error_handler.js index 1c46ee68..4e3fe2af 100644 --- a/plugins/c9.error/error_handler.js +++ b/plugins/c9.error/error_handler.js @@ -115,6 +115,7 @@ function plugin(options, imports, register) { var accept = req.headers.accept || ''; if (statusCode == 500) { + console.error(err && err.stack); emitter.emit("internalServerError", { err: err, req: req From 7d69e30efecb3da7ce6fa7e582d047b959313cce Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 29 Mar 2016 11:22:56 +0000 Subject: [PATCH 273/476] Don't complete globals after dot --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6197ae50..34508284 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", "c9.ide.language.html.diff": "#24f3608d26", - "c9.ide.language.javascript": "#038c0904af", + "c9.ide.language.javascript": "#4731719cfa", "c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.eslint": "#3c57ed1720", "c9.ide.language.javascript.tern": "#b55d0069bb", From 733802607cd24786112020b2a2fcd793d8912865 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 14:57:57 +0200 Subject: [PATCH 274/476] c9-auto-bump 3.1.1973 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8b468cc..451d462a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1972", + "version": "3.1.1973", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From cbd5900fe801dffbac4603c6cc3a975000cace2f Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 14:58:12 +0200 Subject: [PATCH 275/476] c9-auto-bump 3.1.1974 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 451d462a..625fdb4e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1973", + "version": "3.1.1974", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 58e6be87b1c9ce47ee47b6fb562309557ad90dca Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 14:58:36 +0200 Subject: [PATCH 276/476] c9-auto-bump 3.1.1975 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 625fdb4e..fbbb7142 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1974", + "version": "3.1.1975", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8c38f668f44c2c556d9f1c50faee2fc6a9b36244 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 14:58:52 +0200 Subject: [PATCH 277/476] c9-auto-bump 3.1.1976 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fbbb7142..ac3e7d07 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1975", + "version": "3.1.1976", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 9453b661849151d1a1c5db17275876f8e3e81d0c Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 14:59:06 +0200 Subject: [PATCH 278/476] c9-auto-bump 3.1.1977 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a5e034c..413b07bb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1976", + "version": "3.1.1977", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 40cc1c7d0688f8aa1f8ef770b679cf6449067352 Mon Sep 17 00:00:00 2001 From: "Lennart C. L. Kats" Date: Tue, 29 Mar 2016 15:22:56 +0200 Subject: [PATCH 279/476] Revert "Fix, help debug workspace creation issues" --- node_modules/c9/rest_client.js | 6 +----- plugins/c9.ide.dialog.common/alert_internal.js | 2 -- plugins/c9.vfs.client/endpoint.js | 4 ---- plugins/c9.vfs.client/vfs_client.js | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/node_modules/c9/rest_client.js b/node_modules/c9/rest_client.js index 8631edf5..8f42b1d0 100644 --- a/node_modules/c9/rest_client.js +++ b/node_modules/c9/rest_client.js @@ -44,11 +44,7 @@ function RestClient(host, port, config) { port: port, path: path, method: method, - headers: headers, - timeout: config.timeout || 60 * 1000, - pool: config.pool || { - maxSockets: 100000, - }, + headers: headers }; if (config.username) options.auth = config.username + ":" + config.password; diff --git a/plugins/c9.ide.dialog.common/alert_internal.js b/plugins/c9.ide.dialog.common/alert_internal.js index 042b3277..572c48ad 100644 --- a/plugins/c9.ide.dialog.common/alert_internal.js +++ b/plugins/c9.ide.dialog.common/alert_internal.js @@ -42,8 +42,6 @@ define(function(require, module, exports) { .replace(/\n/g, "
") .replace(/(https?:\/\/[^\s]*\b)/g, "$1"); - plugin.getElement("ok").setCaption(options.yes || "OK"); - plugin.update([ { id: "dontshow", visible: options && options.showDontShow } ]); diff --git a/plugins/c9.vfs.client/endpoint.js b/plugins/c9.vfs.client/endpoint.js index 59197dc9..c90ff5e3 100644 --- a/plugins/c9.vfs.client/endpoint.js +++ b/plugins/c9.vfs.client/endpoint.js @@ -225,10 +225,6 @@ define(function(require, exports, module) { callback(fatalError(res.error.message, "dashboard")); return; } - else if (err.code == 404) { - callback(fatalError("This workspace no longer appears to exist or failed to be created.", "dashboard")); - return; - } else if (err.code === 428 && res.error) { emit("restore", { projectState: res.error.projectState, diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js index 0f07d9b4..9e11a4d0 100644 --- a/plugins/c9.vfs.client/vfs_client.js +++ b/plugins/c9.vfs.client/vfs_client.js @@ -253,7 +253,7 @@ define(function(require, exports, module) { err.message = "SSH permission denied. Please review your workspace configuration."; return showAlert("Workspace Error", "Unable to access your workspace", err.message, function() { window.location = dashboardUrl; - }, { yes: "Return to dashboard" }); + }); case "reload": lastError = showError(err.message + ". Please reload this window.", -1); setTimeout(function() { From e47b3120a5af375c29a5e8877babe8c37e1da7cc Mon Sep 17 00:00:00 2001 From: "Lennart C. L. Kats" Date: Tue, 29 Mar 2016 15:24:44 +0200 Subject: [PATCH 280/476] Revert "Revert "Fix, help debug workspace creation issues"" --- node_modules/c9/rest_client.js | 6 +++++- plugins/c9.ide.dialog.common/alert_internal.js | 2 ++ plugins/c9.vfs.client/endpoint.js | 4 ++++ plugins/c9.vfs.client/vfs_client.js | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/node_modules/c9/rest_client.js b/node_modules/c9/rest_client.js index 8f42b1d0..8631edf5 100644 --- a/node_modules/c9/rest_client.js +++ b/node_modules/c9/rest_client.js @@ -44,7 +44,11 @@ function RestClient(host, port, config) { port: port, path: path, method: method, - headers: headers + headers: headers, + timeout: config.timeout || 60 * 1000, + pool: config.pool || { + maxSockets: 100000, + }, }; if (config.username) options.auth = config.username + ":" + config.password; diff --git a/plugins/c9.ide.dialog.common/alert_internal.js b/plugins/c9.ide.dialog.common/alert_internal.js index 572c48ad..042b3277 100644 --- a/plugins/c9.ide.dialog.common/alert_internal.js +++ b/plugins/c9.ide.dialog.common/alert_internal.js @@ -42,6 +42,8 @@ define(function(require, module, exports) { .replace(/\n/g, "
") .replace(/(https?:\/\/[^\s]*\b)/g, "$1"); + plugin.getElement("ok").setCaption(options.yes || "OK"); + plugin.update([ { id: "dontshow", visible: options && options.showDontShow } ]); diff --git a/plugins/c9.vfs.client/endpoint.js b/plugins/c9.vfs.client/endpoint.js index c90ff5e3..59197dc9 100644 --- a/plugins/c9.vfs.client/endpoint.js +++ b/plugins/c9.vfs.client/endpoint.js @@ -225,6 +225,10 @@ define(function(require, exports, module) { callback(fatalError(res.error.message, "dashboard")); return; } + else if (err.code == 404) { + callback(fatalError("This workspace no longer appears to exist or failed to be created.", "dashboard")); + return; + } else if (err.code === 428 && res.error) { emit("restore", { projectState: res.error.projectState, diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js index 9e11a4d0..0f07d9b4 100644 --- a/plugins/c9.vfs.client/vfs_client.js +++ b/plugins/c9.vfs.client/vfs_client.js @@ -253,7 +253,7 @@ define(function(require, exports, module) { err.message = "SSH permission denied. Please review your workspace configuration."; return showAlert("Workspace Error", "Unable to access your workspace", err.message, function() { window.location = dashboardUrl; - }); + }, { yes: "Return to dashboard" }); case "reload": lastError = showError(err.message + ". Please reload this window.", -1); setTimeout(function() { From 465e69363a45c8d2cbba331288db98830e62f3e5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 15:24:49 +0200 Subject: [PATCH 281/476] c9-auto-bump 3.1.1978 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 413b07bb..b7eecc98 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1977", + "version": "3.1.1978", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8b62f58b690fcd2373cfe5e9ef3ebdc0c2f03985 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 29 Mar 2016 15:28:35 +0200 Subject: [PATCH 282/476] Fix optional options --- plugins/c9.ide.dialog.common/alert_internal.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/c9.ide.dialog.common/alert_internal.js b/plugins/c9.ide.dialog.common/alert_internal.js index 042b3277..98744ee1 100644 --- a/plugins/c9.ide.dialog.common/alert_internal.js +++ b/plugins/c9.ide.dialog.common/alert_internal.js @@ -26,6 +26,8 @@ define(function(require, module, exports) { /***** Methods *****/ function show(title, header, msg, onhide, options) { + options = options || {}; + metrics.increment("dialog.error"); return plugin.queue(function(){ @@ -37,15 +39,15 @@ define(function(require, module, exports) { else { plugin.title = title; } - plugin.heading = options && options.isHTML ? header : util.escapeXml(header); - plugin.body = options && options.isHTML ? msg : (util.escapeXml(msg) || "") + plugin.heading = options.isHTML ? header : util.escapeXml(header); + plugin.body = options.isHTML ? msg : (util.escapeXml(msg) || "") .replace(/\n/g, "
") .replace(/(https?:\/\/[^\s]*\b)/g, "$1"); plugin.getElement("ok").setCaption(options.yes || "OK"); plugin.update([ - { id: "dontshow", visible: options && options.showDontShow } + { id: "dontshow", visible: options.showDontShow } ]); plugin.once("hide", function(){ From 329e24def196040206958b2ef608ca5eb3c39308 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 16:51:35 +0200 Subject: [PATCH 283/476] c9-auto-bump 3.1.1979 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b7eecc98..112d3ed0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1978", + "version": "3.1.1979", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From feba4da537659a7fbf5fca340502b8b5af614ae0 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 17:07:11 +0200 Subject: [PATCH 284/476] c9-auto-bump 3.1.1980 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 112d3ed0..4fd0caed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1979", + "version": "3.1.1980", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d3d228e87cf2753e5096f278c8d67c2b39f2bbe0 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 17:39:25 +0200 Subject: [PATCH 285/476] c9-auto-bump 3.1.1981 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4fd0caed..a658134e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1980", + "version": "3.1.1981", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 84c81a9f30aa18de9f0ccb62a4d9d9e95730f3bf Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Mar 2016 19:51:55 +0400 Subject: [PATCH 286/476] move scm v1 into subfolder --- configs/client-default.js | 15 ++++++++------- package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index 750a158c..5e29f6fe 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -806,13 +806,14 @@ module.exports = function(options) { "plugins/c9.ide.test.mocha/mocha", - // git integration - "plugins/c9.ide.scm/scm", - "plugins/c9.ide.scm/scmpanel", - "plugins/c9.ide.scm/detail", - "plugins/c9.ide.scm/log", - "plugins/c9.ide.scm/git", - "plugins/c9.ide.scm/editor", + // git integration v1 + "plugins/c9.ide.scm/v1/scm", + "plugins/c9.ide.scm/v1/scmpanel", + "plugins/c9.ide.scm/v1/detail", + "plugins/c9.ide.scm/v1/log", + "plugins/c9.ide.scm/v1/git", + "plugins/c9.ide.scm/v1/editor", + // git integration v2 "plugins/c9.ide.scm/mergetool" ]; diff --git a/package.json b/package.json index b7eecc98..049ba203 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#dc87315012", + "c9.ide.scm": "#934b35ae2f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#a282ec1619", "c9.ide.test.mocha": "#fc053b23d2", From b0d77ea2af244767f62c03ce2eb878f1429130e2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 17:59:06 +0200 Subject: [PATCH 287/476] c9-auto-bump 3.1.1982 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a658134e..0b4fc63a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1981", + "version": "3.1.1982", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From cb9466ae62646f2ae1d9d55c79cc6adca611e9fb Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Mar 2016 20:31:45 +0400 Subject: [PATCH 288/476] Revert "Revert "Merge branch 'master' of github.com:c9/newclient"" This reverts commit 223b4dfcc4281f25612b714984e150e74a575c55. --- configs/client-default.js | 31 ++-- .../ace_tree/lib/ace_tree/data_provider.js | 4 +- .../ace_tree/lib/ace_tree/layer/heading.js | 1 + node_modules/vfs-local/localfs.js | 4 +- package.json | 12 +- plugins/c9.cli.bridge/bridge.js | 2 +- .../less/btn-switcher.less | 51 +++++++ plugins/c9.ide.layout.classic/less/main.less | 1 + plugins/c9.ide.layout.classic/skins.xml | 12 ++ .../themes/default-flat-dark.less | 2 +- .../themes/default-flat-light.less | 6 +- plugins/c9.ide.ui/menus.js | 2 +- plugins/c9.ide.ui/ui.js | 2 +- plugins/c9.ide.ui/widgets.list.js | 53 +++++-- .../json-stream.js | 0 plugins/c9.nodeapi/timeago.js | 132 ++++++++++++++++++ 16 files changed, 280 insertions(+), 35 deletions(-) create mode 100644 plugins/c9.ide.layout.classic/less/btn-switcher.less rename plugins/{c9.cli.bridge => c9.nodeapi}/json-stream.js (100%) create mode 100644 plugins/c9.nodeapi/timeago.js diff --git a/configs/client-default.js b/configs/client-default.js index 5e29f6fe..e54593c2 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -806,15 +806,28 @@ module.exports = function(options) { "plugins/c9.ide.test.mocha/mocha", - // git integration v1 - "plugins/c9.ide.scm/v1/scm", - "plugins/c9.ide.scm/v1/scmpanel", - "plugins/c9.ide.scm/v1/detail", - "plugins/c9.ide.scm/v1/log", - "plugins/c9.ide.scm/v1/git", - "plugins/c9.ide.scm/v1/editor", - // git integration v2 - "plugins/c9.ide.scm/mergetool" + // git integration + "plugins/c9.ide.scm/scm", + "plugins/c9.ide.scm/scm.button", + // "plugins/c9.ide.scm/scm.commit", + "plugins/c9.ide.scm/scm.branches", + "plugins/c9.ide.scm/dialog.localchanges", + "plugins/c9.ide.scm/dialog.commit", + "plugins/c9.ide.scm/scm.log", + "plugins/c9.ide.scm/scmpanel", + "plugins/c9.ide.scm/detail", + // "plugins/c9.ide.scm/log", + "plugins/c9.ide.scm/git", + "plugins/c9.ide.scm/editor", + "plugins/c9.ide.scm/mergetool", + + // // git integration v1 + // "plugins/c9.ide.scm/v1/scm", + // "plugins/c9.ide.scm/v1/scmpanel", + // "plugins/c9.ide.scm/v1/detail", + // "plugins/c9.ide.scm/v1/log", + // "plugins/c9.ide.scm/v1/git", + // "plugins/c9.ide.scm/v1/editor", ]; diff --git a/node_modules/ace_tree/lib/ace_tree/data_provider.js b/node_modules/ace_tree/lib/ace_tree/data_provider.js index 4709fe1c..ea343c72 100644 --- a/node_modules/ace_tree/lib/ace_tree/data_provider.js +++ b/node_modules/ace_tree/lib/ace_tree/data_provider.js @@ -417,7 +417,7 @@ DataProvider.variableHeightRowMixin = function() { var items = this.visibleItems; var top = 0, index = 0, l = items.length; while (index < l) { - var height = this.getItemHeight(items[index].height, index); + var height = this.getItemHeight(items[index], index); top += height; index++; if (top >= offset) { @@ -445,7 +445,7 @@ DataProvider.variableHeightRowMixin = function() { var items = this.visibleItems; var startH = 0, index = 0, l = items.length; while (index < l) { - var height = this.getItemHeight(items[index].height, index); + var height = this.getItemHeight(items[index], index); startH += height; index++; if (startH >= top) { diff --git a/node_modules/ace_tree/lib/ace_tree/layer/heading.js b/node_modules/ace_tree/lib/ace_tree/layer/heading.js index 834155fd..60256532 100644 --- a/node_modules/ace_tree/lib/ace_tree/layer/heading.js +++ b/node_modules/ace_tree/lib/ace_tree/layer/heading.js @@ -68,6 +68,7 @@ function ColumnHeader(parentEl, renderer) { } col.pixelWidth = 0; }, this); + columns.fixedWidth = fixedWidth; columns.$fixedWidth = fixedWidth + "px"; columns.width = null; provider.columns = columns; diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js index dcad436c..16ba5c0d 100644 --- a/node_modules/vfs-local/localfs.js +++ b/node_modules/vfs-local/localfs.js @@ -200,7 +200,9 @@ module.exports = function setup(fsOptions) { // Extending the API extend: extend, unextend: unextend, - use: use + use: use, + + workspaceDir: fsOptions.projectDir }); function wrapDomain(api) { diff --git a/package.json b/package.json index 049ba203..38d9fc1b 100644 --- a/package.json +++ b/package.json @@ -67,12 +67,12 @@ "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#871d8e5e5d", - "c9.ide.collab": "#7d3d49fa8e", + "c9.ide.collab": "#968713f5c8", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", "c9.ide.find.replace": "#8cbce45290", - "c9.ide.run.debug": "#7d6da73fc7", + "c9.ide.run.debug": "#32cf8977c6", "c9.automate": "#47e2c429c9", "c9.ide.ace.emmet": "#6dc4585e02", "c9.ide.ace.gotoline": "#a8ff07c8f4", @@ -94,10 +94,10 @@ "c9.ide.language.python": "#330b80e3b2", "c9.ide.language.go": "#6ce1c7a7ef", "c9.ide.mount": "#4c39359b87", - "c9.ide.navigate": "#1fbb7cd53b", + "c9.ide.navigate": "#bc87b56fc5", "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#2ae85a9e33", - "c9.ide.preview": "#70bd68740c", + "c9.ide.preview": "#5f5fff0185", "c9.ide.preview.browser": "#897177be7f", "c9.ide.preview.markdown": "#c3174d86e0", "c9.ide.pubsub": "#a85fb27eca", @@ -109,9 +109,9 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#934b35ae2f", + "c9.ide.scm": "#c60694b87e", "c9.ide.terminal.monitor": "#1a4092ede2", - "c9.ide.test": "#a282ec1619", + "c9.ide.test": "#8905405655", "c9.ide.test.mocha": "#fc053b23d2", "c9.ide.theme.flat": "#81dadeee55", "c9.ide.threewaymerge": "#229382aa0b", diff --git a/plugins/c9.cli.bridge/bridge.js b/plugins/c9.cli.bridge/bridge.js index 7819c56c..7b7ae4b3 100644 --- a/plugins/c9.cli.bridge/bridge.js +++ b/plugins/c9.cli.bridge/bridge.js @@ -8,7 +8,7 @@ define(function(require, exports, module) { var c9 = imports.c9; var ext = imports.ext; - var JSONStream = require("./json-stream"); + var JSONStream = require("json-stream"); /***** Initialization *****/ diff --git a/plugins/c9.ide.layout.classic/less/btn-switcher.less b/plugins/c9.ide.layout.classic/less/btn-switcher.less new file mode 100644 index 00000000..3af6342c --- /dev/null +++ b/plugins/c9.ide.layout.classic/less/btn-switcher.less @@ -0,0 +1,51 @@ +.btn-switcher { + .user-select(none); + + cursor: default; + line-height: 19px; + font-size: @preview-chooser-font-size; + font-weight: @preview-chooser-font-weight; + color: ; + font-family: @preview-chooser-font-family; + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; + background: @preview-chooser-background; + border-radius: 0 2px 2px 0; + box-shadow: @preview-chooser-box-shadow; + cursor: pointer; + border: 1px solid @textbox-border-color; + border-left : 0; + border-radius: 0 3px 3px 0; + position : relative; + + padding: 4px 17px 4px 8px; + box-sizing: border-box; +} +.btn-switcherOver{ + background: @preview-chooser-over-background; +} +.btn-switcherDown{ + background: @preview-chooser-active-background; +} +.btn-switcher svg{ + vertical-align: middle; + margin: -2px 4px 0 0; +} + +.btn-switcher span{ + display : block; + position : absolute; + right : 6px; + top : 11px; + width : 5px; + height : 5px; + background: url("@{image-path}/@{preview-chooser-arrow}") no-repeat; + opacity: 0.6; +} + +.btn-switcherIcon { + background-repeat: no-repeat; + padding-left: 25px; + padding-top: 5px; + background-position: 5px 6px; +} \ No newline at end of file diff --git a/plugins/c9.ide.layout.classic/less/main.less b/plugins/c9.ide.layout.classic/less/main.less index 7c158e95..a2a4dd5d 100644 --- a/plugins/c9.ide.layout.classic/less/main.less +++ b/plugins/c9.ide.layout.classic/less/main.less @@ -47,6 +47,7 @@ BODY.noInput *{ @import "less/button.less"; @import "less/btn_console.less"; @import "less/btn_console_open.less"; +@import "less/btn-switcher.less"; @import "less/c9-divider-double.less"; @import "less/c9-divider-hor.less"; @import "less/c9-divider.less"; diff --git a/plugins/c9.ide.layout.classic/skins.xml b/plugins/c9.ide.layout.classic/skins.xml index 4fe050bc..6e78f388 100644 --- a/plugins/c9.ide.layout.classic/skins.xml +++ b/plugins/c9.ide.layout.classic/skins.xml @@ -859,4 +859,16 @@ + + + +
+ - +
+ + + \ No newline at end of file diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less index 9ba1ada6..98a1e73b 100644 --- a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less +++ b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less @@ -1711,7 +1711,7 @@ @form-bar-border-bottom: 1px solid black; @form-bar-box-shadow: 0 1px @border-highlight; -@panel-settings-changes-top: 46px; +@panel-settings-changes-top: 53px; /*******/ diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less index bc630707..0b98c4ed 100644 --- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less @@ -1706,9 +1706,9 @@ @diff-toolbar-buttons-background: #F9F9F9; @diff-toolbar-buttons-border: 1px solid @border-highlight-dark; -@form-bar-padding: 10px 50px 10px 10px; +@form-bar-padding: 10px 10px 10px 10px; @form-bar-background: @menu-button-active-background; -@form-bar-border-bottom: 1px solid black; +@form-bar-border-bottom: 1px solid #DEDEDE; @form-bar-box-shadow: 0 1px @border-highlight; -@panel-settings-changes-top: 46px; \ No newline at end of file +@panel-settings-changes-top: 53px; \ No newline at end of file diff --git a/plugins/c9.ide.ui/menus.js b/plugins/c9.ide.ui/menus.js index 2db45cc9..f3078363 100644 --- a/plugins/c9.ide.ui/menus.js +++ b/plugins/c9.ide.ui/menus.js @@ -967,7 +967,7 @@ define(function(require, exports, module) { checkItems.call(this, e); }, "onitemclick" : function(e) { - emit("itemclick", { value : e.value }); + emit("itemclick", { value : e.value, item: e.relatedNode }); } }); aml.cloud9menu = plugin; diff --git a/plugins/c9.ide.ui/ui.js b/plugins/c9.ide.ui/ui.js index d45b7f5b..9ea5b344 100644 --- a/plugins/c9.ide.ui/ui.js +++ b/plugins/c9.ide.ui/ui.js @@ -124,7 +124,7 @@ define(function(require, module, exports) { "list", "tab", "textbox", "textarea", "radiobutton", "checkbox", "page", "splitter", "hsplitbox", "vsplitbox", "group", "img", "label", "spinner", "dropdown", "BindingColumnRule", "datagrid", "hbox", "vbox", "colorbox", - "frame", "password", "modalwindow", "filler", "splitbutton"].forEach(function(tag) { + "frame", "password", "modalwindow", "filler", "splitbutton", "codebox"].forEach(function(tag) { plugin[tag] = function(struct) { return new apf[tag](struct); }; diff --git a/plugins/c9.ide.ui/widgets.list.js b/plugins/c9.ide.ui/widgets.list.js index 397e4105..928982b9 100644 --- a/plugins/c9.ide.ui/widgets.list.js +++ b/plugins/c9.ide.ui/widgets.list.js @@ -34,7 +34,7 @@ define(function(require, exports, module) { var acetree; var model; var redirectEvents; - var filterRoot; + var fRoot; var meta = {}; var dataType = options.model ? "object" : options.dataType; var excludedEvents = { @@ -251,6 +251,16 @@ define(function(require, exports, module) { */ get enableDragdrop(){ return acetree.getOption("enableDragDrop"); }, set enableDragdrop(value){ acetree.setOption("enableDragDrop", value); }, + /** + * + */ + get enableVariableHeight(){ return model.getItemHeight; }, + set enableVariableHeight(value){ + if (!value) throw new Error("Unable to remove variable height"); + + var variableHeightRowMixin = model.constructor.variableHeightRowMixin; + variableHeightRowMixin.apply(model); + }, /** * */ @@ -296,18 +306,20 @@ define(function(require, exports, module) { set filterKeyword(value){ model.keyword = value; if (!model.keyword) { - filterRoot = null; + fRoot = null; model.reKeyword = null; model.setRoot(model.cachedRoot); } else { model.reKeyword = new RegExp("(" + util.escapeRegExp(model.keyword) + ")", 'i'); - filterRoot = search.treeSearch( - model.cachedRoot.items || model.cachedRoot, + fRoot = search.treeSearch( + model.filterRoot + ? model.filterRoot.items || model.filterRoot + : model.cachedRoot.items || model.cachedRoot, model.keyword, model.filterCaseInsensitive, - null, null, model.indexProperty); - model.setRoot(filterRoot); + null, null, model.filterProperty); + model.setRoot(fRoot); } }, /** @@ -320,6 +332,11 @@ define(function(require, exports, module) { */ get filterProperty(){ return model.filterProperty; }, set filterProperty(value){ model.filterProperty = value; }, + /** + * + */ + get filterRoot(){ return model.filterRoot; }, + set filterRoot(value){ model.filterRoot = value; }, /** * */ @@ -394,11 +411,21 @@ define(function(require, exports, module) { */ get getClassName(){ return model.getClassName; }, set getClassName(fn){ model.getClassName = fn; }, + /** + * + */ + get getTooltipText(){ return model.getTooltipText; }, + set getTooltipText(fn){ model.getTooltipText = fn; }, /** * */ get getIndex(){ return model.getIndex; }, set getIndex(fn){ model.getIndex = fn; }, + /** + * + */ + get getItemHeight(){ return model.getItemHeight; }, + set getItemHeight(fn){ model.getItemHeight = fn; }, // Events _events: [ @@ -494,7 +521,10 @@ define(function(require, exports, module) { */ setRoot: function(root){ model.cachedRoot = root; - return model.setRoot(root); + if (model.keyword) + plugin.filterKeyword = model.keyword; + else + return model.setRoot(root); }, /** * @@ -538,8 +568,8 @@ define(function(require, exports, module) { /** * */ - scrollIntoView: function(anchor, lead, offset){ - return acetree.renderer.scrollCaretIntoView(anchor, lead, offset); + scrollIntoView: function(anchor, offset){ + return acetree.renderer.scrollCaretIntoView(anchor, offset); }, /** * @@ -585,7 +615,10 @@ define(function(require, exports, module) { * */ refresh: function(){ - model.setRoot(filterRoot || plugin.root); + if (model.keyword) + plugin.filterKeyword = model.keyword; + else + model.setRoot(plugin.root); }, /** * diff --git a/plugins/c9.cli.bridge/json-stream.js b/plugins/c9.nodeapi/json-stream.js similarity index 100% rename from plugins/c9.cli.bridge/json-stream.js rename to plugins/c9.nodeapi/json-stream.js diff --git a/plugins/c9.nodeapi/timeago.js b/plugins/c9.nodeapi/timeago.js new file mode 100644 index 00000000..5d7e61f5 --- /dev/null +++ b/plugins/c9.nodeapi/timeago.js @@ -0,0 +1,132 @@ +define(function(require, exports, module) { + + function timeago(timestamp) { + if (timestamp instanceof Date) { + return inWords(timestamp); + } else if (typeof timestamp === "string") { + return inWords(parse(timestamp)); + } else if (typeof timestamp === "number") { + return inWords(new Date(timestamp)); + } else { + return timeagoElement(timestamp); + } + } + + var settings = { + refreshMillis: 60000, + allowFuture: false, + strings: { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "ago", + suffixFromNow: "from now", + seconds: "less than a minute", + minute: "about a minute", + minutes: "%d minutes", + hour: "about an hour", + hours: "about %d hours", + day: "a day", + days: "%d days", + month: "about a month", + months: "%d months", + year: "about a year", + years: "%d years", + wordSeparator: " ", + numbers: [] + } + }; + function distanceInWords(distanceMillis) { + var $l = settings.strings; + var prefix = $l.prefixAgo; + var suffix = $l.suffixAgo; + if (settings.allowFuture) { + if (distanceMillis < 0) { + prefix = $l.prefixFromNow; + suffix = $l.suffixFromNow; + } + } + + var seconds = Math.abs(distanceMillis) / 1000; + var minutes = seconds / 60; + var hours = minutes / 60; + var days = hours / 24; + var years = days / 365; + + function substitute(stringOrFunction, number) { + var string = typeof stringOrFunction === "function" ? stringOrFunction(number, distanceMillis) : stringOrFunction; + var value = ($l.numbers && $l.numbers[number]) || number; + return string.replace(/%d/i, value); + } + + var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || + seconds < 90 && substitute($l.minute, 1) || + minutes < 45 && substitute($l.minutes, Math.round(minutes)) || + minutes < 90 && substitute($l.hour, 1) || + hours < 24 && substitute($l.hours, Math.round(hours)) || + hours < 42 && substitute($l.day, 1) || + days < 30 && substitute($l.days, Math.round(days)) || + days < 45 && substitute($l.month, 1) || + days < 365 && substitute($l.months, Math.round(days / 30)) || + years < 1.5 && substitute($l.year, 1) || + substitute($l.years, Math.round(years)); + + var separator = $l.wordSeparator || ""; + if ($l.wordSeparator === undefined) { separator = " "; } + return [prefix, words, suffix].filter(function(s) { return s; }) + .map(function(s){ return s.trim(); }) + .join(separator); + } + function parse(iso8601) { + var s = iso8601.trim(); + s = s.replace(/\.\d+/,""); // remove milliseconds + s = s.replace(/-/,"/").replace(/-/,"/"); + s = s.replace(/T/," ").replace(/Z/," UTC"); + s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 + return new Date(s); + } + function datetime(elem) { + var iso8601 = isTime(elem) ? elem.getAttribute("datetime") : elem.getAttribute("title"); + return parse(iso8601); + } + function isTime(elem) { + return elem.tagName.toLowerCase() === "time"; + } + + function timeagoElement(elem) { + refresh(elem); + if (settings.refreshMillis > 0) + setInterval(refresh.bind(null, elem), settings.refreshMillis); + } + + function refresh(elem) { + var datetime = prepareDateTime(elem); + if (!isNaN(datetime)) + elem.textContent = inWords(datetime); + } + + function prepareDateTime(elem) { + var timeagoAttr = elem.getAttribute("timeago"); + if (timeagoAttr) + return new Date(timeagoAttr); + var data = datetime(elem); + elem.setAttribute("timeago", data); + var text = elem.textContent.trim(); + if (text.length > 0 && !(isTime(elem) && elem.title)) + elem.title = text; + return data; + } + + function inWords(date) { + return distanceInWords(distance(date)); + } + + function distance(date) { + return (new Date().getTime() - date.getTime()); + } + + // fix for IE6 suckage + document.createElement("abbr"); + document.createElement("time"); + + module.exports = timeago; +}); \ No newline at end of file From 51a37142811c6273496d6b38ed6647fb76914c04 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 25 Nov 2015 15:16:52 +0000 Subject: [PATCH 289/476] Add loading state to nodes in branches tree --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38d9fc1b..6fe1049b 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#c60694b87e", + "c9.ide.scm": "#a95acf6aa2", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#8905405655", "c9.ide.test.mocha": "#fc053b23d2", From f0e043cdcc0014d603276bd90a992b6704796324 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 25 Nov 2015 22:32:41 +0000 Subject: [PATCH 290/476] disable polling --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6fe1049b..8430c6a2 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#a95acf6aa2", + "c9.ide.scm": "#aa289fd6bf", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#8905405655", "c9.ide.test.mocha": "#fc053b23d2", From a4adbd78b3b9835f63e40422847be903287f3997 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 15:45:13 +0000 Subject: [PATCH 291/476] Moved commit to a panel and tweaks to single line ace --- configs/client-default.js | 4 +-- package.json | 4 +-- .../c9.ide.layout.classic/less/codebox.less | 5 ++- .../themes/default-flat-light.less | 2 +- plugins/c9.ide.ui/codebox.js | 34 +++++++++---------- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index e54593c2..09509385 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -808,11 +808,9 @@ module.exports = function(options) { // git integration "plugins/c9.ide.scm/scm", - "plugins/c9.ide.scm/scm.button", - // "plugins/c9.ide.scm/scm.commit", + "plugins/c9.ide.scm/scm.commit", "plugins/c9.ide.scm/scm.branches", "plugins/c9.ide.scm/dialog.localchanges", - "plugins/c9.ide.scm/dialog.commit", "plugins/c9.ide.scm/scm.log", "plugins/c9.ide.scm/scmpanel", "plugins/c9.ide.scm/detail", diff --git a/package.json b/package.json index 8430c6a2..c1f94867 100644 --- a/package.json +++ b/package.json @@ -109,9 +109,9 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#aa289fd6bf", + "c9.ide.scm": "#31c730a295", "c9.ide.terminal.monitor": "#1a4092ede2", - "c9.ide.test": "#8905405655", + "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", "c9.ide.theme.flat": "#81dadeee55", "c9.ide.threewaymerge": "#229382aa0b", diff --git a/plugins/c9.ide.layout.classic/less/codebox.less b/plugins/c9.ide.layout.classic/less/codebox.less index 129aeee6..b9a3e3c7 100644 --- a/plugins/c9.ide.layout.classic/less/codebox.less +++ b/plugins/c9.ide.layout.classic/less/codebox.less @@ -70,9 +70,8 @@ .tb_console.tb_textboxInitial .input { font-size : 10px; } - -.tb_console.tb_textboxInitial .ace_cursor{ - display : none; +.tb_console.tb_textboxInitial .ace_scroller { + text-indent: 2px; } .tb_consoleDisabled .sbtb_middle { diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less index 0b98c4ed..01c4ff40 100644 --- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less @@ -1706,7 +1706,7 @@ @diff-toolbar-buttons-background: #F9F9F9; @diff-toolbar-buttons-border: 1px solid @border-highlight-dark; -@form-bar-padding: 10px 10px 10px 10px; +@form-bar-padding: 10px 10px 0 10px; @form-bar-background: @menu-button-active-background; @form-bar-border-bottom: 1px solid #DEDEDE; @form-bar-box-shadow: 0 1px @border-highlight; diff --git a/plugins/c9.ide.ui/codebox.js b/plugins/c9.ide.ui/codebox.js index 698e6fca..2dcda2c3 100644 --- a/plugins/c9.ide.ui/codebox.js +++ b/plugins/c9.ide.ui/codebox.js @@ -87,28 +87,25 @@ apf.codebox = function(struct, tagName) { this.$editor = this.ace = ace; ace.renderer.setPadding(2); this.ace.codebox = this; - - ace.on("focus", function() { - dom.removeCssClass(ace.codebox.$ext, "tb_textboxInitial"); - - if (ace.renderer.initialMessageNode) { + + var checkInitial = function() { + var value = ace.getValue(); + if (value && ace.renderer.initialMessageNode) { + dom.removeCssClass(ace.codebox.$ext, "tb_textboxInitial"); ace.renderer.scroller.removeChild(ace.renderer.initialMessageNode); ace.renderer.initialMessageNode = null; } - }); + else if (!value && !ace.renderer.initialMessageNode) { + dom.addCssClass(ace.codebox.$ext, "tb_textboxInitial"); + ace.renderer.initialMessageNode = document.createTextNode(ace.codebox["initial-message"] || ""); + ace.renderer.scroller.appendChild(ace.renderer.initialMessageNode); + } + + }; + ace.on("input", checkInitial); - function onBlur() { - if (ace.$isFocused || ace.session.getValue()) - return; - dom.addCssClass(ace.codebox.$ext, "tb_textboxInitial"); - - if (ace.renderer.initialMessageNode) - return; - ace.renderer.initialMessageNode = document.createTextNode(ace.codebox["initial-message"] || ""); - ace.renderer.scroller.appendChild(ace.renderer.initialMessageNode); - } - ace.on("blur", onBlur); - setTimeout(onBlur, 100); + setTimeout(checkInitial, 100); + // todo should we do this here? // ace.on("resize", function(){apf.layout.forceResize();}); @@ -181,6 +178,7 @@ apf.codebox = function(struct, tagName) { new MultiSelect(editor); editor.session.setUndoManager(new UndoManager()); + editor.setOption("indentedSoftWrap", false); editor.setHighlightActiveLine(false); editor.setShowPrintMargin(false); editor.renderer.setShowGutter(false); From 294bbf69345a3e9a48362edd4dd095d13a4b4524 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 17 Nov 2015 01:39:26 +0400 Subject: [PATCH 292/476] fix empty message in tree --- node_modules/ace_tree/lib/ace_tree/layer/cells.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/node_modules/ace_tree/lib/ace_tree/layer/cells.js b/node_modules/ace_tree/lib/ace_tree/layer/cells.js index 9a25c4f8..c0eeffeb 100644 --- a/node_modules/ace_tree/lib/ace_tree/layer/cells.js +++ b/node_modules/ace_tree/lib/ace_tree/layer/cells.js @@ -51,7 +51,7 @@ var Cells = function(parentEl) { this.$renderRow(html, datarow, vsize, hsize, row); } - if (firstRow === 0 && lastRow === 0) { + if (firstRow <= 0 && lastRow <= 0) { this.renderPlaceHolder(provider, html, config); } @@ -130,7 +130,7 @@ var Cells = function(parentEl) { provider.renderRow(row, html, config); } - if (firstRow === 0 && lastRow === 0) { + if (firstRow <= 0 && lastRow <= 0) { this.renderPlaceHolder(provider, html, config); } @@ -187,7 +187,7 @@ var Cells = function(parentEl) { } else if (provider.getEmptyMessage) { html.push( "
", - provider.getEmptyMessage(), + escapeHTML(provider.getEmptyMessage()), "
" ); } From 87d0476697397c12e17c0f213f85032f84b48b17 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 16:53:12 +0000 Subject: [PATCH 293/476] Commit via c9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c1f94867..25377841 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#31c730a295", + "c9.ide.scm": "#3066f0c5d0", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 2a82cb14e0863d60e495e31daf42d4530e595209 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 16:55:08 +0000 Subject: [PATCH 294/476] Commit via c9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25377841..eb765e3c 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#3066f0c5d0", + "c9.ide.scm": "#f2200f788c", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From b081aac78e51e4f0eb57af52ecf8ac3772e05673 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 17:41:51 +0000 Subject: [PATCH 295/476] update commit panel when needed (part 1 of 2) --- package.json | 2 +- plugins/c9.ide.panels/panel.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index eb765e3c..03a8a09f 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#f2200f788c", + "c9.ide.scm": "#3a3e21ac42", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", diff --git a/plugins/c9.ide.panels/panel.js b/plugins/c9.ide.panels/panel.js index ee7be651..cdf02183 100644 --- a/plugins/c9.ide.panels/panel.js +++ b/plugins/c9.ide.panels/panel.js @@ -382,6 +382,11 @@ define(function(require, module, exports) { */ get button(){ return button; }, + /** + * + */ + get active(){ return panels.isActive(plugin.name); }, + _events: [ /** * Fires when the panel is drawn. From bc8cfa159517ac893066d319510e71e429ac9f3f Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 17:44:00 +0000 Subject: [PATCH 296/476] clean up reload --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03a8a09f..3f022eb0 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#3a3e21ac42", + "c9.ide.scm": "#1d65ed3689", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 0f32932a62b780417efe099f087b15ae6914bbcf Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 17:52:37 +0000 Subject: [PATCH 297/476] Add proper events to git implementation. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f022eb0..6c182414 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#1d65ed3689", + "c9.ide.scm": "#060aeb48d6", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 77418a7ec2a4d0025e5eabf6048d330d9c44e34c Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 17:58:51 +0000 Subject: [PATCH 298/476] Clear out failed status service attempt and update when panel opens (2/2) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c182414..d15b99d8 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#060aeb48d6", + "c9.ide.scm": "#a1a7663719", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 5ee8d010b85faf4d5043b3bf0fdfa4ff8bc2cf2a Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 18:00:14 +0000 Subject: [PATCH 299/476] Clear out failed status service attempt and update when panel opens (2/2) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d15b99d8..3e810a65 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#a1a7663719", + "c9.ide.scm": "#64d604f16f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From c5b417ade427dcddf2fc8b937acbfde2f52bdadb Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 18:03:31 +0000 Subject: [PATCH 300/476] Fix amend --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e810a65..52cb3b5d 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#64d604f16f", + "c9.ide.scm": "#99397ff0e9", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 5775e64f595ddca38218db5244832f4790df18f8 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 26 Nov 2015 18:09:08 +0000 Subject: [PATCH 301/476] Only show cursor when codebox has focus --- package.json | 2 +- plugins/c9.ide.layout.classic/less/codebox.less | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 52cb3b5d..1f0f0b78 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#99397ff0e9", + "c9.ide.scm": "#95a0c688d0", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", diff --git a/plugins/c9.ide.layout.classic/less/codebox.less b/plugins/c9.ide.layout.classic/less/codebox.less index b9a3e3c7..ec164470 100644 --- a/plugins/c9.ide.layout.classic/less/codebox.less +++ b/plugins/c9.ide.layout.classic/less/codebox.less @@ -73,6 +73,12 @@ .tb_console.tb_textboxInitial .ace_scroller { text-indent: 2px; } +.tb_console.tb_textboxInitial .ace_cursor{ + display : none; +} +.tb_console.tb_textboxInitial .ace_focus .ace_cursor{ + display : block; +} .tb_consoleDisabled .sbtb_middle { background : #e2e2e2; From c6f3358aaf090f4fb40ac165b8586ca8279f6816 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 09:43:02 +0000 Subject: [PATCH 302/476] Add icons for syncing --- configs/client-default.js | 9 ++++++--- package.json | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index 09509385..c323fbfd 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -807,8 +807,11 @@ module.exports = function(options) { "plugins/c9.ide.test.mocha/mocha", // git integration + { + packagePath: "plugins/c9.ide.scm/scm.commit", + staticPrefix: staticPrefix + "/plugins/c9.ide.scm" + }, "plugins/c9.ide.scm/scm", - "plugins/c9.ide.scm/scm.commit", "plugins/c9.ide.scm/scm.branches", "plugins/c9.ide.scm/dialog.localchanges", "plugins/c9.ide.scm/scm.log", @@ -816,8 +819,8 @@ module.exports = function(options) { "plugins/c9.ide.scm/detail", // "plugins/c9.ide.scm/log", "plugins/c9.ide.scm/git", - "plugins/c9.ide.scm/editor", - "plugins/c9.ide.scm/mergetool", + "plugins/c9.ide.scm/diff.sidebyside", + "plugins/c9.ide.scm/mergetool" // // git integration v1 // "plugins/c9.ide.scm/v1/scm", diff --git a/package.json b/package.json index 1f0f0b78..651ced15 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#95a0c688d0", + "c9.ide.scm": "#2af39fcbb5", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 710db81ce6989c6c5de16b3a945135b9d8366237 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 26 Nov 2015 19:50:08 +0400 Subject: [PATCH 303/476] add simple unified diff viewer # Conflicts: # .eslintrc --- node_modules/ace/lib/ace/line_widgets.js | 2 +- node_modules/ace/lib/ace/mode/diff.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/node_modules/ace/lib/ace/line_widgets.js b/node_modules/ace/lib/ace/line_widgets.js index 6eaffc88..83b0af94 100644 --- a/node_modules/ace/lib/ace/line_widgets.js +++ b/node_modules/ace/lib/ace/line_widgets.js @@ -214,7 +214,7 @@ function LineWidgets(session) { if (!w.coverGutter) { w.el.style.zIndex = 3; } - if (!w.pixelHeight) { + if (w.pixelHeight == null) { w.pixelHeight = w.el.offsetHeight; } if (w.rowCount == null) { diff --git a/node_modules/ace/lib/ace/mode/diff.js b/node_modules/ace/lib/ace/mode/diff.js index 72671a27..f3c46a1b 100644 --- a/node_modules/ace/lib/ace/mode/diff.js +++ b/node_modules/ace/lib/ace/mode/diff.js @@ -38,7 +38,7 @@ var FoldMode = require("./folding/diff").FoldMode; var Mode = function() { this.HighlightRules = HighlightRules; - this.foldingRules = new FoldMode(["diff", "index", "\\+{3}", "@@|\\*{5}"], "i"); + this.foldingRules = new FoldMode(["diff", "@@|\\*{5}"], "i"); }; oop.inherits(Mode, TextMode); diff --git a/package.json b/package.json index 651ced15..a9a282c8 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#2af39fcbb5", + "c9.ide.scm": "#b7bce1f37f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From dd986ea3923f103e232b212f85b4c5529aa13a8b Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 09:47:13 +0000 Subject: [PATCH 304/476] rename files --- configs/client-default.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index c323fbfd..d635fdd3 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -819,7 +819,7 @@ module.exports = function(options) { "plugins/c9.ide.scm/detail", // "plugins/c9.ide.scm/log", "plugins/c9.ide.scm/git", - "plugins/c9.ide.scm/diff.sidebyside", + "plugins/c9.ide.scm/diff.split", "plugins/c9.ide.scm/mergetool" // // git integration v1 diff --git a/package.json b/package.json index a9a282c8..ebfa4646 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#b7bce1f37f", + "c9.ide.scm": "#d9a5988b4f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 48a583b173081b87e786201bde7bd0b30401e4fa Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 10:47:30 +0000 Subject: [PATCH 305/476] almost integration. Got errors. --- configs/client-default.js | 4 +--- package.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index d635fdd3..9d4b2497 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -815,11 +815,9 @@ module.exports = function(options) { "plugins/c9.ide.scm/scm.branches", "plugins/c9.ide.scm/dialog.localchanges", "plugins/c9.ide.scm/scm.log", - "plugins/c9.ide.scm/scmpanel", - "plugins/c9.ide.scm/detail", - // "plugins/c9.ide.scm/log", "plugins/c9.ide.scm/git", "plugins/c9.ide.scm/diff.split", + "plugins/c9.ide.scm/diff.unified", "plugins/c9.ide.scm/mergetool" // // git integration v1 diff --git a/package.json b/package.json index ebfa4646..4b2fe7a1 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#d9a5988b4f", + "c9.ide.scm": "#94c7a4d70d", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From a7741c0cbf0ccd964642b6ebf9896e9405b6f67b Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 11:21:03 +0000 Subject: [PATCH 306/476] Show 'no changes' when there are no changes' # Conflicts: # .c9/project.settings --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b2fe7a1..ef227d45 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#94c7a4d70d", + "c9.ide.scm": "#41a6218c6a", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From bd4df0c754e937bdf923e950c762c6076cb16c4d Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 11:47:53 +0000 Subject: [PATCH 307/476] Add are you sure dialog and proper error handling to syncing --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef227d45..e73625c2 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#41a6218c6a", + "c9.ide.scm": "#f4543453b2", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From ec85598138459079ae0b2334f8e5c961ce91d6aa Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 12:44:38 +0000 Subject: [PATCH 308/476] Properly deal with no repository configured # Conflicts: # .c9/project.settings --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e73625c2..d47721ad 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#f4543453b2", + "c9.ide.scm": "#fe258163eb", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 26c3c1d9a4a315dff7ff552e0d06a12a23580d0b Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 30 Nov 2015 16:34:31 +0400 Subject: [PATCH 309/476] fix performance of file header rendering --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d47721ad..1ccdea13 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#fe258163eb", + "c9.ide.scm": "#18d5cbb181", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From b0398eddc419b418fe4bd07f2e0af3130fe47a27 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 13:56:24 +0000 Subject: [PATCH 310/476] TWeaking unified diff # Conflicts: # .c9/project.settings --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ccdea13..ffe7ae3d 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#18d5cbb181", + "c9.ide.scm": "#85e2087b88", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From b16c28a38759a848d8b0a2e888a03e842a602dcf Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 15:44:29 +0000 Subject: [PATCH 311/476] further styling --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ffe7ae3d..d61e3a72 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#85e2087b88", + "c9.ide.scm": "#f6997c470a", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From dd3ca1c048dbd095fd4956e2e427e0b6ef05dfb6 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 30 Nov 2015 18:03:01 +0400 Subject: [PATCH 312/476] highlight full width of gutter --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d61e3a72..6339c26f 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#f6997c470a", + "c9.ide.scm": "#4ea56ae8ed", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 9f1e106217ecec9742ab52e4fbfb88f89c880df2 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 1 Dec 2015 11:32:44 +0000 Subject: [PATCH 313/476] Block reentry of status update --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6339c26f..fa1ed915 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#4ea56ae8ed", + "c9.ide.scm": "#6b7c9f7d0f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From b6462134438b54067368be186a77805c40a205b8 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 1 Dec 2015 04:12:09 +0400 Subject: [PATCH 314/476] fix diff view tokenizer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fa1ed915..d8e6f8c3 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#6b7c9f7d0f", + "c9.ide.scm": "#a9ac2bfaf5", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From bd5e7ef07a68f152cfae50ceba094f78558cb22f Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 1 Dec 2015 12:49:10 +0000 Subject: [PATCH 315/476] open diff with spacebar/enter --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8e6f8c3..31db667b 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#a9ac2bfaf5", + "c9.ide.scm": "#ffa061f046", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From a7843fa24d8d07296787bffcd9d338b67179d9e2 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 1 Dec 2015 12:57:31 +0000 Subject: [PATCH 316/476] Fix commit and show file with Shift-Enter --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 31db667b..2da94597 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#ffa061f046", + "c9.ide.scm": "#0ea1ef7138", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From f73cf1b9e5871b97f88799a4a5b8728814f687d1 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 1 Dec 2015 12:58:36 +0000 Subject: [PATCH 317/476] Remove Show Branches --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2da94597..405d6117 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#0ea1ef7138", + "c9.ide.scm": "#11120df31c", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From ad131a676014863c013501fec573f846f53ff9e8 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 1 Dec 2015 13:00:38 +0000 Subject: [PATCH 318/476] Move menu items around --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 405d6117..f9d4ee6d 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#11120df31c", + "c9.ide.scm": "#2f6b669b57", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From e666ed67f7f45b7a3e76375d27e574693b781c01 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 1 Dec 2015 13:02:17 +0000 Subject: [PATCH 319/476] Fix typo --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f9d4ee6d..5728ffa5 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#2f6b669b57", + "c9.ide.scm": "#4259b0337f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From d958da1b7d64c5944115cbc3e8d699d7b203ad02 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 1 Dec 2015 13:11:24 +0000 Subject: [PATCH 320/476] Toggle detail view in log with double click --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5728ffa5..e4881afe 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#4259b0337f", + "c9.ide.scm": "#1a9441ac4f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 9bb536da15cb6afd88c9252b7218f93283727430 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 1 Dec 2015 13:12:34 +0000 Subject: [PATCH 321/476] Rename checkout menu --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e4881afe..0ecbf878 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#1a9441ac4f", + "c9.ide.scm": "#bfa38ccde4", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 276a1f7bc5e12cf7e0c32ce3615495b6db0dbdb8 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 1 Dec 2015 13:57:31 +0000 Subject: [PATCH 322/476] Add a context menu to the commit panel --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0ecbf878..8a31308e 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#bfa38ccde4", + "c9.ide.scm": "#f0bf5c9d3f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 248e3b1345605d6b017a6cdef47efabb7828c7e8 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 10:34:50 +0000 Subject: [PATCH 323/476] interaction cleanpu --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a31308e..02646652 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#f0bf5c9d3f", + "c9.ide.scm": "#d6ec71569b", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From ade862df24bc06780b55f8b09c5f6562ff54330b Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 2 Dec 2015 05:11:35 +0400 Subject: [PATCH 324/476] more style tweaks + folding --- node_modules/ace/lib/ace/mode/folding/diff.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node_modules/ace/lib/ace/mode/folding/diff.js b/node_modules/ace/lib/ace/mode/folding/diff.js index 23c0e2d0..54185ad1 100644 --- a/node_modules/ace/lib/ace/mode/folding/diff.js +++ b/node_modules/ace/lib/ace/mode/folding/diff.js @@ -61,7 +61,7 @@ oop.inherits(FoldMode, BaseFoldMode); } if (row == start.row + 1) return; - return Range.fromPoints(start, {row: row - 1, column: line.length}); + return new Range(start.row, start.column, row - 1, line.length); }; }).call(FoldMode.prototype); diff --git a/package.json b/package.json index 02646652..04206988 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#d6ec71569b", + "c9.ide.scm": "#8f68d44c71", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 798d0b45677d95b83d075cbc9b53c6369a6c5d02 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 2 Dec 2015 13:32:26 +0400 Subject: [PATCH 325/476] prevent infinite loop from git status --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 04206988..4fdbcec9 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#8f68d44c71", + "c9.ide.scm": "#9ab6e1b1c9", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 9d4772016f5e20379cc59fbf9dc180ede3c9ebde Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 11:36:04 +0000 Subject: [PATCH 326/476] move diff opening to scm and generalize usage --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4fdbcec9..f72c7b44 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#9ab6e1b1c9", + "c9.ide.scm": "#6d333516cc", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From b17bfec0949c3a989c38d6aeb2c6a0c5d1fac754 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 13:13:27 +0000 Subject: [PATCH 327/476] Add preview to log and remove detail view --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f72c7b44..22749e2c 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#6d333516cc", + "c9.ide.scm": "#da84c63595", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 6073eccafc636b1f059f2e5c4a9116f66b55bc80 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 13:26:58 +0000 Subject: [PATCH 328/476] Fix preview animation --- package.json | 2 +- plugins/c9.ide.editors/tab.js | 4 ++-- plugins/c9.ide.editors/tabmanager.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 22749e2c..dfecae24 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#da84c63595", + "c9.ide.scm": "#770f11a3ad", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", diff --git a/plugins/c9.ide.editors/tab.js b/plugins/c9.ide.editors/tab.js index 5457b4c6..d1692979 100644 --- a/plugins/c9.ide.editors/tab.js +++ b/plugins/c9.ide.editors/tab.js @@ -291,9 +291,9 @@ define(function(require, module, exports) { load(); }); - plugin.on("beforeUnload", function(){ + plugin.on("beforeUnload", function(e){ if (!plugin.meta.$closing) { - if (close()) + if (close(e && e.animate === false)) return false; } }); diff --git a/plugins/c9.ide.editors/tabmanager.js b/plugins/c9.ide.editors/tabmanager.js index da270a71..caf097d3 100644 --- a/plugins/c9.ide.editors/tabmanager.js +++ b/plugins/c9.ide.editors/tabmanager.js @@ -1283,7 +1283,7 @@ define(function(require, module, exports) { // Or keep tab until the new one is loaded else { - previewTab.unload(); + previewTab.unload({ animate: false }); } } From 8c2b30ad879214aa125d1e78443b617db1357c2b Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 13:41:38 +0000 Subject: [PATCH 329/476] Interaction and loading fixes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dfecae24..166d7f6e 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#770f11a3ad", + "c9.ide.scm": "#db755ee6b5", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From a51ad133b86e11230a77c828c89eaab89d5e8062 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 13:57:39 +0000 Subject: [PATCH 330/476] Automatically hide the commit panel after a commit when opened via hotkeys. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 166d7f6e..10df5c69 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#fff9c75928", + "c9.ide.language": "#1d4d9fa21a", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#db755ee6b5", + "c9.ide.scm": "#22af54d32d", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 8ec60169649b24a09e8e8088f0de3284636c0ff5 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 14:18:18 +0000 Subject: [PATCH 331/476] Fix styling of disabled states and tweak autohide. --- package.json | 2 +- plugins/c9.ide.layout.classic/less/codebox.less | 3 +++ plugins/c9.ide.layout.classic/themes/default-flat-light.less | 4 ++-- plugins/c9.ide.layout.classic/themes/flat-light.less | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 10df5c69..e260e8d2 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#22af54d32d", + "c9.ide.scm": "#2e19f7a48c", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", diff --git a/plugins/c9.ide.layout.classic/less/codebox.less b/plugins/c9.ide.layout.classic/less/codebox.less index ec164470..c4cfd5c1 100644 --- a/plugins/c9.ide.layout.classic/less/codebox.less +++ b/plugins/c9.ide.layout.classic/less/codebox.less @@ -18,6 +18,9 @@ color : @textbox-disabled-color; background: @textbox-disabled-background; } +.has_apf .searchTxt.tb_console.ace_searchboxDisabled .sbtb_middle .input { + color : @textbox-disabled-color; +} .ace_one-line .ace_scroller.ace_scroll-left { box-shadow: none; } diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less index 01c4ff40..74aa8f16 100644 --- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less @@ -1066,8 +1066,8 @@ @textbox-border-color: darken(#dedede, @darken-chrome); @textbox-initial-color: darken(#A5A5A5, @darken-chrome); @textbox-initial-text-shadow: 0 1px 0 darken(#FFFFFF, @darken-chrome); -@textbox-disabled-color: gray; -@textbox-disabled-background: darken(rgb(216, 216, 216), @darken-chrome); +@textbox-disabled-color: #C5C5C5; +@textbox-disabled-background: #F1F1F1; // Textbox - Simple @tbsimple-border: 1px solid #DEDEDE; diff --git a/plugins/c9.ide.layout.classic/themes/flat-light.less b/plugins/c9.ide.layout.classic/themes/flat-light.less index 351b97ee..82317527 100644 --- a/plugins/c9.ide.layout.classic/themes/flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/flat-light.less @@ -470,6 +470,9 @@ body .runner-form-header{ .cbblack.cbcontainerDisabled.cbcontainerChecked .checkbox{ background-position: 0 -142px; } + .cbblack.cbcontainerDisabled.cbcontainerDisabled .checkbox{ + background-position: 0 0; + } .session_btn .tab_middle:before { background-position : 0 -126px; -webkit-mask-position : 0 -95px; From 8781b551a477201d2eb740e445afd1853eb60cdf Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 14:29:42 +0000 Subject: [PATCH 332/476] Fix sequence for diff --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e260e8d2..f46ba049 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#2e19f7a48c", + "c9.ide.scm": "#76666b3eee", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 0a7655ee4d97a05fe6171ef87f672bd069e4752f Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 2 Dec 2015 18:28:47 +0400 Subject: [PATCH 333/476] fix render issues in unified diff viewer --- node_modules/ace/lib/ace/edit_session/folding.js | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/node_modules/ace/lib/ace/edit_session/folding.js b/node_modules/ace/lib/ace/edit_session/folding.js index fbab03fa..4e67fe45 100644 --- a/node_modules/ace/lib/ace/edit_session/folding.js +++ b/node_modules/ace/lib/ace/edit_session/folding.js @@ -772,7 +772,7 @@ function Folding() { this.removeFold(fold); else this.expandFold(fold); - return; + return fold; } var range = this.getFoldWidgetRange(row, true); @@ -781,7 +781,7 @@ function Folding() { fold = this.getFoldAt(range.start.row, range.start.column, 1); if (fold && range.isEqual(fold.range)) { this.removeFold(fold); - return; + return fold; } } diff --git a/package.json b/package.json index f46ba049..886b6386 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#76666b3eee", + "c9.ide.scm": "#1c9d8d87e5", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 027252a9107640081e8958a466b8c9bd15000bf0 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 14:46:25 +0000 Subject: [PATCH 334/476] Question for Harutyun --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 886b6386..578f8f66 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#1c9d8d87e5", + "c9.ide.scm": "#95b64c6f0b", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 36734a7bbda28035ab9868ac139c13940d4ac462 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 2 Dec 2015 20:57:30 +0400 Subject: [PATCH 335/476] fix rendering of empty diffview --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 578f8f66..e5c49b3e 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#95b64c6f0b", + "c9.ide.scm": "#9bd236e73c", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 5ee14d049973773e8b3fa8b4c7b6cf4d2456562d Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 17:07:41 +0000 Subject: [PATCH 336/476] Dont call ready too often, hide content when loading a new diff and dont autohide after reload --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5c49b3e..d2026faf 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#9bd236e73c", + "c9.ide.scm": "#d1d4d78c4f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From c8fc26cd3e9d253e43b1ab6bbec01fdaf2abeed9 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 17:15:14 +0000 Subject: [PATCH 337/476] Better fix for the order of the diff compare --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d2026faf..69b6a31d 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#d1d4d78c4f", + "c9.ide.scm": "#912f0c2276", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From dc471afd2085b3b936b0514fab1d9548822d4559 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 17:19:21 +0000 Subject: [PATCH 338/476] by default double click on branches opens diff --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 69b6a31d..3ea86078 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#912f0c2276", + "c9.ide.scm": "#888dd6c44f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 317a868eb2592e612b387e98d5bafd5ad95df01d Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 2 Dec 2015 21:20:48 +0400 Subject: [PATCH 339/476] fix rendering of last diff marker --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ea86078..89a429c2 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#888dd6c44f", + "c9.ide.scm": "#168965653c", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 8af054c763111bf32fabc5bee2bd8f224a26f0cf Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 17:30:23 +0000 Subject: [PATCH 340/476] Fix sync --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89a429c2..bd1be9b2 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#168965653c", + "c9.ide.scm": "#30a71b85c3", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From bce57ff1bc7941e6d79c4fa045ddadde260ca9be Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 17:36:28 +0000 Subject: [PATCH 341/476] add syncing to the button --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd1be9b2..4c0e0189 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#30a71b85c3", + "c9.ide.scm": "#123d60496f", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From cf8d7bee7f452d53037d64b63d76d76667f0b6c3 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 2 Dec 2015 17:44:02 +0000 Subject: [PATCH 342/476] Fix Syncing --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c0e0189..78cd3fe7 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#123d60496f", + "c9.ide.scm": "#7771d4b2e5", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 96cd0d4c4dba262d32e4133a05a1637750bc4424 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Thu, 24 Dec 2015 19:44:23 +0000 Subject: [PATCH 343/476] don't fail when .on() is called on scmProvider --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 78cd3fe7..31ab3ab8 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#7771d4b2e5", + "c9.ide.scm": "#8aab7dbbb5", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 3a8089537272a015a4d84e6c20cfa7094772913a Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 4 Jan 2016 20:16:57 +0000 Subject: [PATCH 344/476] Working on toolbars # Conflicts: # plugins/c9.ide.performancestats/stats.js --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 31ab3ab8..194ca605 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#8aab7dbbb5", + "c9.ide.scm": "#df1cc01f45", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 29a88542028bd7e516cd761823e1b347ae8c928c Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 19:34:09 +0200 Subject: [PATCH 345/476] c9-auto-bump 3.1.1983 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b4fc63a..121b442d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1982", + "version": "3.1.1983", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8d6b0698855464e7c8ff072e834a167c1d521d4a Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 29 Mar 2016 20:15:22 +0200 Subject: [PATCH 346/476] c9-auto-bump 3.1.1984 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 121b442d..6e19770e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1983", + "version": "3.1.1984", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2a72d18fd3c4547f62642aab67c41afdf23b37c5 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Mar 2016 23:27:01 +0400 Subject: [PATCH 347/476] fix initial-message in codebox and use it in panels --- package.json | 4 ++-- plugins/c9.ide.keys/commands.js | 17 +++++++++++++++++ plugins/c9.ide.keys/panel.js | 3 +++ plugins/c9.ide.layout.classic/less/codebox.less | 5 +---- plugins/c9.ide.panels/panel.js | 8 ++++++++ plugins/c9.vfs.standalone/www/test.js | 2 ++ 6 files changed, 33 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 194ca605..5e2ddc89 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#1d4d9fa21a", + "c9.ide.language": "#6d5a10ac4f", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", @@ -94,7 +94,7 @@ "c9.ide.language.python": "#330b80e3b2", "c9.ide.language.go": "#6ce1c7a7ef", "c9.ide.mount": "#4c39359b87", - "c9.ide.navigate": "#bc87b56fc5", + "c9.ide.navigate": "#0b7ec7936c", "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#2ae85a9e33", "c9.ide.preview": "#5f5fff0185", diff --git a/plugins/c9.ide.keys/commands.js b/plugins/c9.ide.keys/commands.js index 0cab430e..5cae4001 100644 --- a/plugins/c9.ide.keys/commands.js +++ b/plugins/c9.ide.keys/commands.js @@ -96,9 +96,18 @@ define(function(require, exports, module) { } function getHotkey(command) { + if (!commands[command] || !commands[command].bindKey) + return ""; return commands[command].bindKey[platform]; } + function getPrettyHotkey(command) { + var key = getHotkey(command); + if (platform == "mac") + key = apf.hotkeys.toMacNotation(key); + return key; + } + var markDirty = lang.delayedCall(function(){ emit("update"); }, 500); @@ -557,6 +566,14 @@ define(function(require, exports, module) { */ getHotkey: getHotkey, + /** + * returns result of getHotkey formatted for displaying in menus + * + * @param {String} name the name of the command. + * @return {String} + */ + getPrettyHotkey: getPrettyHotkey, + /** * Executes the action tied to a command. This method will call * the `isAvailable` method for a command and will not execute if diff --git a/plugins/c9.ide.keys/panel.js b/plugins/c9.ide.keys/panel.js index a2d1cf0f..8f102d52 100644 --- a/plugins/c9.ide.keys/panel.js +++ b/plugins/c9.ide.keys/panel.js @@ -79,6 +79,9 @@ define(function(require, exports, module) { // @TODO this is probably not sufficient layout.on("resize", function(){ tree.resize() }, plugin); + var key = commands.getPrettyHotkey("commands"); + txtFilter.setAttribute("initial-message", key); + tree.textInput = txtFilter.ace.textInput; txtFilter.ace.commands.addCommands([ diff --git a/plugins/c9.ide.layout.classic/less/codebox.less b/plugins/c9.ide.layout.classic/less/codebox.less index c4cfd5c1..6df6168c 100644 --- a/plugins/c9.ide.layout.classic/less/codebox.less +++ b/plugins/c9.ide.layout.classic/less/codebox.less @@ -66,15 +66,12 @@ padding : 0; } -.tb_console.tb_textboxInitial .sbtb_middle { - padding-right : 0 !important; -} .tb_console.tb_textboxInitial .input { font-size : 10px; } .tb_console.tb_textboxInitial .ace_scroller { - text-indent: 2px; + text-indent: 5px; } .tb_console.tb_textboxInitial .ace_cursor{ display : none; diff --git a/plugins/c9.ide.panels/panel.js b/plugins/c9.ide.panels/panel.js index cdf02183..f1245f4b 100644 --- a/plugins/c9.ide.panels/panel.js +++ b/plugins/c9.ide.panels/panel.js @@ -147,6 +147,14 @@ define(function(require, module, exports) { mnuItem.setAttribute("hotkey", "{commands.commandManager." + options.name + "}"); + + + if (button && button.setAttribute) { + var key = commands.getPrettyHotkey(options.name); + button.setAttribute("tooltip", options.name + + (key ? " (" + key + ")" : "")); + } + return command; } diff --git a/plugins/c9.vfs.standalone/www/test.js b/plugins/c9.vfs.standalone/www/test.js index f30a80b4..3d2217ef 100644 --- a/plugins/c9.vfs.standalone/www/test.js +++ b/plugins/c9.vfs.standalone/www/test.js @@ -199,6 +199,8 @@ require([ c.exec = function(name) { commands[name].exec(); }; + c.getPrettyHotkey = function(name) { return "" }; + c.getHotkey = function(name) { return "" }; c.getExceptionList = function(){ return []; }; return c; From 6b9391d29360874a0267845bebf0b70c6e245953 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Mar 2016 23:29:07 +0400 Subject: [PATCH 348/476] fix issue with broken cache always rebuilding the main css --- .../build_support/mini_require.js | 30 +++++++++++++++---- package.json | 2 +- plugins/c9.static/cdn.js | 2 ++ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/node_modules/architect-build/build_support/mini_require.js b/node_modules/architect-build/build_support/mini_require.js index 004cde85..2ed88842 100644 --- a/node_modules/architect-build/build_support/mini_require.js +++ b/node_modules/architect-build/build_support/mini_require.js @@ -427,7 +427,7 @@ var host = location.protocol + "//" + location.hostname + (location.port ? ":" + var loadScript = function(path, id, callback) { if (!config.useCache) return loadScriptWithTag(path, id, callback); - if (!/https?:/.test(path)) + if (!/^https?:/.test(path)) path = host + path; var cb = function(e, val, deps) { if (e) return processLoadQueue({ id: id, path: path }); @@ -498,10 +498,12 @@ function checkCache() { }).then(function(keys) { baseUrl = host + config.baseUrl; var val = keys.map(function(r) { - var url = r.url; - if (url.startsWith(baseUrl)) - url = url.slice(baseUrl.length); - return r.headers.get("etag") + " " + url; + var url = r.url; + if (url.startsWith(baseUrl)) + url = url.slice(baseUrl.length); + else if (/^\w+:/.test(url)) + return ""; + return r.headers.get("etag") + " " + url; }).join("\n") + "\n"; if (val.length == 1) { ideCachePromiss = null; @@ -510,7 +512,7 @@ function checkCache() { return new Promise(function(resolve) { var checked = 0; var buffer = ""; - var toDelete = [] + var toDelete = []; post("/static/__check__", val, function(t) { var e = t.slice(checked); checked = t.length; @@ -539,6 +541,22 @@ function checkCache() { return ideCachePromiss; } +require.clearCache = function(callback) { + ideCachePromiss = config.useCache && window.caches.open("ide").then(function(ideCache_) { + ideCache = ideCache_; + return ideCache.keys(); + }).then(function(keys) { + var toDelete = keys.map(function(i) { + ideCache.delete(i); + }); + Promise.all(toDelete).then(function() { + callback && callback(); + }, function(e) { + callback && callback(e); + }); + }); +} + function post(path, val, progress, cb) { var xhr = new window.XMLHttpRequest(); xhr.open("POST", path, true); diff --git a/package.json b/package.json index 5e2ddc89..9e0cd0bc 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#df1cc01f45", + "c9.ide.scm": "#d5da7e1893", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", diff --git a/plugins/c9.static/cdn.js b/plugins/c9.static/cdn.js index ede7d5f6..023a2257 100644 --- a/plugins/c9.static/cdn.js +++ b/plugins/c9.static/cdn.js @@ -76,6 +76,8 @@ function main(options, imports, register) { var parts = e.split(" "); var id = parts[1]; var etag = parts[0]; + if (!id || /^https?:\/\//.test(id)) + return q.oneDone(); var path = resolveModulePath(id, req.pathConfig.pathMap); if (path == id && !/^(\/|\w:)/.test(path)) { From 91ae54c08ce6b605a94803d7d0f5c529d5e03be3 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 29 Mar 2016 23:31:54 +0400 Subject: [PATCH 349/476] switch to v1 for now --- configs/client-default.js | 40 ++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index 9d4b2497..9c216749 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -806,27 +806,29 @@ module.exports = function(options) { "plugins/c9.ide.test.mocha/mocha", - // git integration - { - packagePath: "plugins/c9.ide.scm/scm.commit", - staticPrefix: staticPrefix + "/plugins/c9.ide.scm" - }, - "plugins/c9.ide.scm/scm", - "plugins/c9.ide.scm/scm.branches", - "plugins/c9.ide.scm/dialog.localchanges", - "plugins/c9.ide.scm/scm.log", - "plugins/c9.ide.scm/git", - "plugins/c9.ide.scm/diff.split", - "plugins/c9.ide.scm/diff.unified", - "plugins/c9.ide.scm/mergetool" + // git integration v2 + // { + // packagePath: "plugins/c9.ide.scm/scm.commit", + // staticPrefix: staticPrefix + "/plugins/c9.ide.scm" + // }, + // "plugins/c9.ide.scm/scm", + // "plugins/c9.ide.scm/scm.branches", + // "plugins/c9.ide.scm/dialog.localchanges", + // "plugins/c9.ide.scm/scm.log", + // "plugins/c9.ide.scm/git", + // "plugins/c9.ide.scm/diff.split", + // "plugins/c9.ide.scm/diff.unified", // // git integration v1 - // "plugins/c9.ide.scm/v1/scm", - // "plugins/c9.ide.scm/v1/scmpanel", - // "plugins/c9.ide.scm/v1/detail", - // "plugins/c9.ide.scm/v1/log", - // "plugins/c9.ide.scm/v1/git", - // "plugins/c9.ide.scm/v1/editor", + "plugins/c9.ide.scm/v1/scm", + "plugins/c9.ide.scm/v1/scmpanel", + "plugins/c9.ide.scm/v1/detail", + "plugins/c9.ide.scm/v1/log", + "plugins/c9.ide.scm/v1/git", + "plugins/c9.ide.scm/v1/editor", + + // git integration + "plugins/c9.ide.scm/mergetool" ]; diff --git a/package.json b/package.json index 9e0cd0bc..d92a65b3 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#d5da7e1893", + "c9.ide.scm": "#219b66019a", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From ea475b24dc7d6b33e0f76e3b6a6124350f2d8cdb Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Tue, 29 Mar 2016 19:51:36 +0000 Subject: [PATCH 350/476] Upgrade asyncjs to 1.5.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e19770e..c44a6971 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "acorn": "2.5.2", - "async": "^0.9.0", + "async": "^1.5.2", "base64id": "~0.1.0", "connect": "~2.12.0", "debug": "~0.7.4", From b32912e359ec48e5ce63c2b956eff9ec104c2fda Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 02:20:17 +0200 Subject: [PATCH 351/476] c9-auto-bump 3.1.1985 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e19770e..c3078ab3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1984", + "version": "3.1.1985", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e1dcd8369a3e66c042b715c6afa3d74556174825 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 03:16:38 +0200 Subject: [PATCH 352/476] c9-auto-bump 3.1.1986 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c3078ab3..c4663073 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1985", + "version": "3.1.1986", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 9582a0679825531313cfd6cdfcfff039590f33fa Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 04:16:20 +0200 Subject: [PATCH 353/476] c9-auto-bump 3.1.1987 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c4663073..2a485517 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1986", + "version": "3.1.1987", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From acbc85b230160ae7afffd2a7b445d5bbd9c9dc1d Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 06:04:26 +0200 Subject: [PATCH 354/476] c9-auto-bump 3.1.1988 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2a485517..e84a8286 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1987", + "version": "3.1.1988", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 010fd733ee31568061efc2840439369934dae005 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 09:55:19 +0200 Subject: [PATCH 355/476] c9-auto-bump 3.1.1989 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c98720d8..2bfa1c79 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1988", + "version": "3.1.1989", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 68fed531722857069c89b132d0a332c03c576627 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 29 Mar 2016 13:14:23 +0000 Subject: [PATCH 356/476] Revert "Remove obsolete mode_completer" This reverts commit 95de252cefc77486c569c8aa33615dfd06eb12ab. --- package.json | 2 +- plugins/c9.static/build.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2bfa1c79..e8fb7e6e 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "c9plugins": { "c9.ide.language": "#ebc064ef16", "c9.ide.language.css": "#be07d72209", - "c9.ide.language.generic": "#92210f5a48", + "c9.ide.language.generic": "#61a7d4f7b0", "c9.ide.language.html": "#22fdc74869", "c9.ide.language.html.diff": "#24f3608d26", "c9.ide.language.javascript": "#d1a479805c", diff --git a/plugins/c9.static/build.js b/plugins/c9.static/build.js index ea929cda..b8e69593 100644 --- a/plugins/c9.static/build.js +++ b/plugins/c9.static/build.js @@ -254,6 +254,7 @@ function main(options, imports, register) { "plugins/c9.ide.language/worker", "plugins/c9.ide.language.generic/local_completer", "plugins/c9.ide.language.generic/snippet_completer", + "plugins/c9.ide.language.generic/mode_completer", "plugins/c9.ide.language.generic/open_files_local_completer", "plugins/c9.ide.language.generic/simple/make", "plugins/c9.ide.language.generic/simple/shell", From 548f4b705708ca0d554fe0b003fb4fa2faaee3d6 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 29 Mar 2016 13:16:05 +0000 Subject: [PATCH 357/476] Use CSS mode_completer only in SSH mode --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e8fb7e6e..d72aff72 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "c9plugins": { "c9.ide.language": "#ebc064ef16", "c9.ide.language.css": "#be07d72209", - "c9.ide.language.generic": "#61a7d4f7b0", + "c9.ide.language.generic": "#bd4acfc645", "c9.ide.language.html": "#22fdc74869", "c9.ide.language.html.diff": "#24f3608d26", "c9.ide.language.javascript": "#d1a479805c", From 74ce7fe3fc9765803d579cc0e62363230738fc5d Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 29 Mar 2016 13:19:56 +0000 Subject: [PATCH 358/476] Improve compatibility of CSS and codeintel completer Make their results the same --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d72aff72..8aeedc81 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "c9plugins": { "c9.ide.language": "#ebc064ef16", "c9.ide.language.css": "#be07d72209", - "c9.ide.language.generic": "#bd4acfc645", + "c9.ide.language.generic": "#3949510863", "c9.ide.language.html": "#22fdc74869", "c9.ide.language.html.diff": "#24f3608d26", "c9.ide.language.javascript": "#d1a479805c", From dfe6d7199ab161d50d18d319da0d0a9c6883e215 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 30 Mar 2016 08:04:26 +0000 Subject: [PATCH 359/476] Don't show installer for PHP --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8aeedc81..7c887425 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#871d8e5e5d", + "c9.ide.language.codeintel": "#2b18c5ccb1", "c9.ide.collab": "#968713f5c8", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From b55f22bc224981852a219e29da0974f9ff766450 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 30 Mar 2016 08:07:15 +0000 Subject: [PATCH 360/476] Move setting to client-default --- configs/client-default.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configs/client-default.js b/configs/client-default.js index 9c216749..c7088501 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -317,7 +317,10 @@ module.exports = function(options) { "plugins/c9.ide.language/tooltip", "plugins/c9.ide.language/jumptodef", "plugins/c9.ide.language/worker_util_helper", - "plugins/c9.ide.language.generic/generic", + { + packagePath: "plugins/c9.ide.language.generic/generic", + mode_completer: options.ssh, + }, "plugins/c9.ide.language.css/css", "plugins/c9.ide.language.html/html", "plugins/c9.ide.language.javascript/javascript", From f70091690cfe6858069e298152d3f156e529dfdd Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 10:19:35 +0200 Subject: [PATCH 361/476] c9-auto-bump 3.1.1990 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2bfa1c79..afa9c76f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1989", + "version": "3.1.1990", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ea0aea4b7432100bd2db08e77094bfc7b9083beb Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 30 Mar 2016 08:32:16 +0000 Subject: [PATCH 362/476] Add newclient terminal monitor --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 147becff..adf4f9bf 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", "c9.ide.scm": "#dc87315012", - "c9.ide.terminal.monitor": "#1a4092ede2", + "c9.ide.terminal.monitor": "#affa33572f", "c9.ide.test": "#a282ec1619", "c9.ide.test.mocha": "#fc053b23d2", "c9.ide.theme.flat": "#81dadeee55", From 0ecc96517527322ced1e8240275d0bb1924c6417 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 11:30:48 +0200 Subject: [PATCH 363/476] c9-auto-bump 3.1.1991 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index afa9c76f..ded31b64 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1990", + "version": "3.1.1991", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8687da52d82532704b16274de182e919245fdede Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 11:32:24 +0200 Subject: [PATCH 364/476] c9-auto-bump 3.1.1992 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ded31b64..25298dbe 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1991", + "version": "3.1.1992", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f7edb6e1a88df455ea4d8662c5fd94f68fcafc04 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 11:33:10 +0200 Subject: [PATCH 365/476] c9-auto-bump 3.1.1993 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25298dbe..1415a36d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1992", + "version": "3.1.1993", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5d4dee25ace28305fd2398b718e58b344eb8f096 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Mar 2016 10:33:06 +0000 Subject: [PATCH 366/476] change confusing quit and restart items in cloud9 menu --- package.json | 2 +- plugins/c9.ide.layout.classic/layout.js | 9 --------- plugins/c9.ide.login/login.js | 9 +++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index afa9c76f..1fa73604 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "c9.ide.ace.stripws": "#8885016b9e", "c9.ide.behaviors": "#db32109ebc", "c9.ide.closeconfirmation": "#cee4674141", - "c9.ide.configuration": "#528234d97d", + "c9.ide.configuration": "#a936df26bb", "c9.ide.dialog.wizard": "#7667ec79a8", "c9.ide.fontawesome": "#781602c5d8", "c9.ide.format": "#5ec97fb083", diff --git a/plugins/c9.ide.layout.classic/layout.js b/plugins/c9.ide.layout.classic/layout.js index 50d4c6de..250fbf9f 100644 --- a/plugins/c9.ide.layout.classic/layout.js +++ b/plugins/c9.ide.layout.classic/layout.js @@ -333,15 +333,6 @@ define(function(require, exports, module) { amlNode.$ext.className += " c9btn"; menus.addItemByPath("File/~", new apf.divider(), 1000000, plugin); - - if (!c9.local) { - menus.addItemByPath("Cloud9/~", new apf.divider(), 2000000, plugin); - menus.addItemByPath("Cloud9/Quit Cloud9", new apf.item({ - onclick: function(){ - location.href = "http://c9.io"; - } - }), 2000100, plugin); - } menus.addItemByPath("View/~", new apf.divider(), 9999, plugin); diff --git a/plugins/c9.ide.login/login.js b/plugins/c9.ide.login/login.js index eb9ad2df..fc8e68f0 100644 --- a/plugins/c9.ide.login/login.js +++ b/plugins/c9.ide.login/login.js @@ -40,6 +40,15 @@ define(function(require, exports, module) { }); auth.on("relogin", onReLogin); + + if (!c9.local) { + menus.addItemByPath("Cloud9/~", new apf.divider(), 2000000, plugin); + menus.addItemByPath("Cloud9/Quit Cloud9", new apf.item({ + onclick: function(){ + signout(); + } + }), 2000100, plugin); + } } /***** Methods *****/ From c1f00813ea10ae316fc919c9b71183b3f02b1192 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 30 Mar 2016 11:42:37 +0000 Subject: [PATCH 367/476] Fix property access of undefined --- plugins/c9.ide.dialog.common/upsell.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/c9.ide.dialog.common/upsell.js b/plugins/c9.ide.dialog.common/upsell.js index 44277e37..1b5af324 100644 --- a/plugins/c9.ide.dialog.common/upsell.js +++ b/plugins/c9.ide.dialog.common/upsell.js @@ -32,7 +32,9 @@ define(function(require, module, exports) { title = title || "This is a Premium feature"; header = header || "Upgrade to Premium Now!"; - msg = msg || 'A better, faster, more versatile Cloud9 is just a click away. Check out our amazing premium plans.' + onYes = onYes || function() {}; + onNo = onNo || function() {}; + msg = msg || 'A better, faster, more versatile Cloud9 is just a click away. Check out our amazing premium plans.'; plugin.title = title; plugin.heading = options && options.isHTML ? header : util.escapeXml(header); From 046d9cbbf5c77d3a0ff2c78a0c84e6bdd8174b8a Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 14:35:56 +0200 Subject: [PATCH 368/476] c9-auto-bump 3.1.1994 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1415a36d..163adcf7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1993", + "version": "3.1.1994", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 45e44f14bb189dd00d005aef43bab37071d694b2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 15:21:55 +0200 Subject: [PATCH 369/476] c9-auto-bump 3.1.1995 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 163adcf7..4205839d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1994", + "version": "3.1.1995", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ea4f64e0c79b37ff20df1cd3aaa63d5696edf241 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 17:09:05 +0200 Subject: [PATCH 370/476] c9-auto-bump 3.1.1996 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4205839d..8feb5098 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1995", + "version": "3.1.1996", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0c2fafe10e92322e0817e4798af705bc369158e5 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 30 Mar 2016 15:30:34 +0000 Subject: [PATCH 371/476] Fix button --- plugins/c9.ide.info/info.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/c9.ide.info/info.js b/plugins/c9.ide.info/info.js index c3ad0b6b..5df32577 100644 --- a/plugins/c9.ide.info/info.js +++ b/plugins/c9.ide.info/info.js @@ -74,12 +74,15 @@ define(function(require, exports, module) { plugin.freezePublicAPI({ /** * Returns the logged in user. + * + * @param [callback] * @return {Object} The currently user */ getUser: getUser, /** * Return the active workspace. + * * @return {Object} The currently active workspace */ getWorkspace: getWorkspace, From 23cbb3383320cd80dfe1f244a99d9b93c85314a8 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Mar 2016 19:31:23 +0400 Subject: [PATCH 372/476] fix regression in stripws --- node_modules/ace/lib/ace/ext/whitespace.js | 4 ++-- node_modules/ace/lib/ace/ext/whitespace_test.js | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/node_modules/ace/lib/ace/ext/whitespace.js b/node_modules/ace/lib/ace/ext/whitespace.js index aa20c60a..04074988 100644 --- a/node_modules/ace/lib/ace/ext/whitespace.js +++ b/node_modules/ace/lib/ace/ext/whitespace.js @@ -131,7 +131,7 @@ exports.trimTrailingSpace = function(session, options) { if (options && options.keepCursorPosition) { if (session.selection.rangeCount) { session.selection.rangeList.ranges.forEach(function(x, i, ranges) { - var next = ranges[i + 1] + var next = ranges[i + 1]; if (next && next.cursor.row == x.cursor.row) return; cursors.push(x.cursor); @@ -148,7 +148,7 @@ exports.trimTrailingSpace = function(session, options) { var index = line.search(/\s+$/); if (i == cursorRow) { - if (index < cursors[ci].column) + if (index < cursors[ci].column && index > min) index = cursors[ci].column; ci++; cursorRow = cursors[ci] ? cursors[ci].row : -1; diff --git a/node_modules/ace/lib/ace/ext/whitespace_test.js b/node_modules/ace/lib/ace/ext/whitespace_test.js index cddc52ea..422d346c 100644 --- a/node_modules/ace/lib/ace/ext/whitespace_test.js +++ b/node_modules/ace/lib/ace/ext/whitespace_test.js @@ -183,6 +183,17 @@ module.exports = { trimEmpty: true, keepCursorPosition: true }); + + session.setValue("some text"); + session.selection.fromJSON([{ + start: {row:0,column:4}, + end: {row:0,column:4} + }]); + testOne("some text", { + keepCursorPosition: true, + trimEmpty: true + }); + next(); }, }; From 121f3f4193bd5395d3d7421268ee87e02ad81478 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Mar 2016 19:43:59 +0400 Subject: [PATCH 373/476] fix mispositioned cursor in textboxes with initial message --- package.json | 2 +- plugins/c9.ide.dialog.file/file.xml | 4 ++-- plugins/c9.ide.dialog.login/login.xml | 4 ++-- plugins/c9.ide.layout.classic/less/codebox.less | 16 ++++------------ .../c9.ide.layout.classic/less/searchbox.less | 2 +- plugins/c9.ide.ui/codebox.js | 11 +++++++---- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 8feb5098..08314522 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#871d8e5e5d", - "c9.ide.collab": "#968713f5c8", + "c9.ide.collab": "#728ad2bde2", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", diff --git a/plugins/c9.ide.dialog.file/file.xml b/plugins/c9.ide.dialog.file/file.xml index 590bd4f5..dd4b341e 100644 --- a/plugins/c9.ide.dialog.file/file.xml +++ b/plugins/c9.ide.dialog.file/file.xml @@ -27,7 +27,7 @@ @@ -46,7 +46,7 @@ diff --git a/plugins/c9.ide.dialog.login/login.xml b/plugins/c9.ide.dialog.login/login.xml index 82b954e8..aff22bd0 100644 --- a/plugins/c9.ide.dialog.login/login.xml +++ b/plugins/c9.ide.dialog.login/login.xml @@ -28,7 +28,7 @@ @@ -41,7 +41,7 @@ diff --git a/plugins/c9.ide.layout.classic/less/codebox.less b/plugins/c9.ide.layout.classic/less/codebox.less index 6df6168c..357253c1 100644 --- a/plugins/c9.ide.layout.classic/less/codebox.less +++ b/plugins/c9.ide.layout.classic/less/codebox.less @@ -43,10 +43,6 @@ outline : none; text-overflow : ellipsis; } -.tb_consoleFocus .sbtb_middle, -.tb_consoleOver .sbtb_middle, -.tb_console .sbtb_middle:hover { -} .topborder .sbtb_middle{ border-width : 1px 0 0 0; @@ -67,18 +63,14 @@ } -.tb_console.tb_textboxInitial .input { - font-size : 10px; -} -.tb_console.tb_textboxInitial .ace_scroller { +.ace_editor .tb_textboxInitialMsg { text-indent: 5px; + text-shadow: none; } -.tb_console.tb_textboxInitial .ace_cursor{ + +.ace_initialMsg:not(.ace_focus) .ace_cursor { display : none; } -.tb_console.tb_textboxInitial .ace_focus .ace_cursor{ - display : block; -} .tb_consoleDisabled .sbtb_middle { background : #e2e2e2; diff --git a/plugins/c9.ide.layout.classic/less/searchbox.less b/plugins/c9.ide.layout.classic/less/searchbox.less index 23147036..00f7ef2c 100644 --- a/plugins/c9.ide.layout.classic/less/searchbox.less +++ b/plugins/c9.ide.layout.classic/less/searchbox.less @@ -36,7 +36,7 @@ height: auto; position: relative; } -.searchTxt.tb_textboxInitial .sbtb_middle .input { +.searchTxt.tb_textboxInitial .sbtb_middle .input, .tb_textboxInitialMsg { color: @textbox-initial-color !important; text-shadow: @textbox-initial-text-shadow; font-family: @find-textbox-font-family; diff --git a/plugins/c9.ide.ui/codebox.js b/plugins/c9.ide.ui/codebox.js index 2dcda2c3..504a0aab 100644 --- a/plugins/c9.ide.ui/codebox.js +++ b/plugins/c9.ide.ui/codebox.js @@ -62,7 +62,7 @@ apf.codebox = function(struct, tagName) { this.value = ""; this.$draw = function(){ - //Build Main Skin + // Build Main Skin this.$ext = this.$getExternal(); this.$input = this.$getLayoutNode("main", "input", this.$ext); this.$button = this.$getLayoutNode("main", "button", this.$ext); @@ -91,13 +91,16 @@ apf.codebox = function(struct, tagName) { var checkInitial = function() { var value = ace.getValue(); if (value && ace.renderer.initialMessageNode) { - dom.removeCssClass(ace.codebox.$ext, "tb_textboxInitial"); + dom.removeCssClass(ace.container, "ace_initialMsg"); ace.renderer.scroller.removeChild(ace.renderer.initialMessageNode); ace.renderer.initialMessageNode = null; } else if (!value && !ace.renderer.initialMessageNode) { - dom.addCssClass(ace.codebox.$ext, "tb_textboxInitial"); - ace.renderer.initialMessageNode = document.createTextNode(ace.codebox["initial-message"] || ""); + dom.addCssClass(ace.container, "ace_initialMsg"); + var el = document.createElement("div"); + el.className = "tb_textboxInitialMsg"; + el.textContent = ace.codebox["initial-message"] || ""; + ace.renderer.initialMessageNode = el; ace.renderer.scroller.appendChild(ace.renderer.initialMessageNode); } From 384951cf6b0241d359492598e1d610f1f9e0a390 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Mar 2016 19:47:36 +0400 Subject: [PATCH 374/476] add setting for stripwsKeepCursorPosition --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 08314522..c87d7eb2 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "c9.ide.ace.repl": "#4b88a85b7b", "c9.ide.ace.split": "#0ae0151c78", "c9.ide.ace.statusbar": "#3aab0b67e0", - "c9.ide.ace.stripws": "#8885016b9e", + "c9.ide.ace.stripws": "#042a9936e3", "c9.ide.behaviors": "#db32109ebc", "c9.ide.closeconfirmation": "#cee4674141", "c9.ide.configuration": "#528234d97d", From 9c2d444b73a60a461f6797f8eeb3729eb7fa5c6b Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Mar 2016 19:49:09 +0400 Subject: [PATCH 375/476] fix cli.bridge --- node_modules/architect-build/build_support/mini_require.js | 2 +- plugins/c9.cli.bridge/bridge.js | 2 +- plugins/{c9.nodeapi => c9.cli.bridge}/json-stream.js | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename plugins/{c9.nodeapi => c9.cli.bridge}/json-stream.js (100%) diff --git a/node_modules/architect-build/build_support/mini_require.js b/node_modules/architect-build/build_support/mini_require.js index 2ed88842..c04e9e77 100644 --- a/node_modules/architect-build/build_support/mini_require.js +++ b/node_modules/architect-build/build_support/mini_require.js @@ -542,7 +542,7 @@ function checkCache() { } require.clearCache = function(callback) { - ideCachePromiss = config.useCache && window.caches.open("ide").then(function(ideCache_) { + ideCachePromiss = window.caches.open("ide").then(function(ideCache_) { ideCache = ideCache_; return ideCache.keys(); }).then(function(keys) { diff --git a/plugins/c9.cli.bridge/bridge.js b/plugins/c9.cli.bridge/bridge.js index 7b7ae4b3..7819c56c 100644 --- a/plugins/c9.cli.bridge/bridge.js +++ b/plugins/c9.cli.bridge/bridge.js @@ -8,7 +8,7 @@ define(function(require, exports, module) { var c9 = imports.c9; var ext = imports.ext; - var JSONStream = require("json-stream"); + var JSONStream = require("./json-stream"); /***** Initialization *****/ diff --git a/plugins/c9.nodeapi/json-stream.js b/plugins/c9.cli.bridge/json-stream.js similarity index 100% rename from plugins/c9.nodeapi/json-stream.js rename to plugins/c9.cli.bridge/json-stream.js From 0757e52bdde22f67de07aca8c4c457118b016d84 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Mar 2016 19:49:35 +0400 Subject: [PATCH 376/476] fix raygun error in findreplace --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c87d7eb2..ebec727c 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", - "c9.ide.find.replace": "#8cbce45290", + "c9.ide.find.replace": "#810ebf8bfb", "c9.ide.run.debug": "#32cf8977c6", "c9.automate": "#47e2c429c9", "c9.ide.ace.emmet": "#6dc4585e02", From 2ed10b1b26da4d6d6fdc1be8c4a0c21ca34058d7 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Mar 2016 21:23:00 +0400 Subject: [PATCH 377/476] fix terminal resize on windows --- node_modules/vfs-local/localfs.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js index 2d04ceec..0805a6cd 100644 --- a/node_modules/vfs-local/localfs.js +++ b/node_modules/vfs-local/localfs.js @@ -2008,15 +2008,19 @@ module.exports = function setup(fsOptions) { }; this.destroy = function(){ - pty.destroy.apply(pty, arguments); + return pty.destroy.apply(pty, arguments); }; this.end = function(){ - pty.end.apply(pty, arguments); + return pty.end.apply(pty, arguments); }; this.write = function() { - pty.write.apply(pty, arguments); + return pty.write.apply(pty, arguments); + }; + + this.resize = function() { + return pty.resize.apply(pty, arguments); }; // this.acknowledgeWrite = function(callback) { From 0cd5fb1a72b1b0912f2f80c41ec8ec0e78797a6d Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 30 Mar 2016 21:27:15 +0400 Subject: [PATCH 378/476] fix uncaught exception when debugging program compiled with clang --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ebec727c..76a6b4f0 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", "c9.ide.find.replace": "#810ebf8bfb", - "c9.ide.run.debug": "#32cf8977c6", + "c9.ide.run.debug": "#da12eceb83", "c9.automate": "#47e2c429c9", "c9.ide.ace.emmet": "#6dc4585e02", "c9.ide.ace.gotoline": "#a8ff07c8f4", From 7fdcb93b4da8762010f410f531f656f23d84af82 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 19:57:01 +0200 Subject: [PATCH 379/476] c9-auto-bump 3.1.1997 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76a6b4f0..cf173907 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1996", + "version": "3.1.1997", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 80ecf319f6947ec651be3160ca41347de1a92751 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 20:00:20 +0200 Subject: [PATCH 380/476] c9-auto-bump 3.1.1998 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cf173907..2bb9d7a7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1997", + "version": "3.1.1998", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3e00813f8e115c52e31bf44e78078c9e387bbb52 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 31 Mar 2016 00:37:21 +0400 Subject: [PATCH 381/476] remove more duplicate completions from scope_analyzer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34508284..7287ffe8 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", "c9.ide.language.html.diff": "#24f3608d26", - "c9.ide.language.javascript": "#4731719cfa", + "c9.ide.language.javascript": "#bc7149e11d", "c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.eslint": "#3c57ed1720", "c9.ide.language.javascript.tern": "#b55d0069bb", From a7929c39908eb40bfa5e8dc1fbe0ee9e305df71a Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 22:45:37 +0200 Subject: [PATCH 382/476] c9-auto-bump 3.1.1999 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d020d336..29ebc06f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1998", + "version": "3.1.1999", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 44d123babf4a8861cc906766df77227f063f5bb8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 30 Mar 2016 23:25:29 +0200 Subject: [PATCH 383/476] c9-auto-bump 3.1.2000 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 29ebc06f..95d57e60 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.1999", + "version": "3.1.2000", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From cc0b4d49c824617085069d40a0eba72f72ad46a9 Mon Sep 17 00:00:00 2001 From: Justin Dray Date: Thu, 31 Mar 2016 10:12:31 +1000 Subject: [PATCH 384/476] add -P CPPFLAGS to ncurses install to fix issues on ARM and newer GCC versions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 95d57e60..3855f08e 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "c9.ide.help.support": "#932fbb3743", "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#19758abe08", - "c9.ide.installer": "#cad8f8316d", + "c9.ide.installer": "#1232d4e179", "c9.ide.language.python": "#330b80e3b2", "c9.ide.language.go": "#6ce1c7a7ef", "c9.ide.mount": "#4c39359b87", From 447ce054da99da8844123cbe373360a2e30f9c10 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 10:02:23 +0200 Subject: [PATCH 385/476] c9-auto-bump 3.1.2001 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 95d57e60..049e73e7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2000", + "version": "3.1.2001", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4e7d2b214db0677ca732593e38d8ca34a6cca47e Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 10:03:33 +0200 Subject: [PATCH 386/476] c9-auto-bump 3.1.2002 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d330e231..2ac28b1a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2001", + "version": "3.1.2002", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4d114bca43036c86ac2a8a71e43161e44a804b4e Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 31 Mar 2016 09:17:59 +0000 Subject: [PATCH 387/476] Improve dialog --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1415a36d..9edaa6d0 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "c9.ide.find": "#e33fbaed2f", "c9.ide.find.infiles": "#c0a13737ef", "c9.ide.find.replace": "#8cbce45290", - "c9.ide.run.debug": "#32cf8977c6", + "c9.ide.run.debug": "#071d3f1be8", "c9.automate": "#47e2c429c9", "c9.ide.ace.emmet": "#6dc4585e02", "c9.ide.ace.gotoline": "#a8ff07c8f4", From d0a2dfddd6afc1c975b01dfe3da41a26e821b6c4 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 31 Mar 2016 09:21:43 +0000 Subject: [PATCH 388/476] when strange unicode characters are in the string then content length is not correct --- node_modules/c9/rest_client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node_modules/c9/rest_client.js b/node_modules/c9/rest_client.js index 8631edf5..0aec2fff 100644 --- a/node_modules/c9/rest_client.js +++ b/node_modules/c9/rest_client.js @@ -36,7 +36,7 @@ function RestClient(host, port, config) { var headers = _.extend({ "Accept": "application/json", "Content-Type": "application/json", - "Content-Length": payload.length + "Content-Length": Buffer.byteLength(payload) }, config.headers || {}); var options = { From 8fa3f769c5c192bc7bed7be929a87da46e51c30f Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 31 Mar 2016 09:22:39 +0000 Subject: [PATCH 389/476] add unit test --- node_modules/c9/rest_client_test.js | 55 +++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 node_modules/c9/rest_client_test.js diff --git a/node_modules/c9/rest_client_test.js b/node_modules/c9/rest_client_test.js new file mode 100644 index 00000000..a0f07779 --- /dev/null +++ b/node_modules/c9/rest_client_test.js @@ -0,0 +1,55 @@ +#!/usr/bin/env node + +/*global describe it before after beforeEach afterEach */ +"use strict"; + +"use server"; +"use mocha"; + +require("c9/inline-mocha")(module); +require("amd-loader"); + +var assert = require("assert"); +var http = require("http"); +var findFreePort = require("netutil").findFreePort; +var RestClient = require("./rest_client"); + +describe(__filename, function() { + + var port; + var MIN_API_PORT = 18500; + var MAX_API_PORT = MIN_API_PORT + 1000; + + beforeEach(function(next) { + findFreePort(MIN_API_PORT, MAX_API_PORT, 'localhost', function(err, _port) { + port = _port; + next(err); + }); + }); + + it("should send correct content length", function(next) { + var server = http.createServer(function(req, res) { + var body = ""; + req.on("data", function(d) { + body += d; + }); + + req.on("end", function() { + JSON.parse(body); + res.end("OK"); + }); + + }); + server.listen(port, function() { + var client = new RestClient("localhost", port, {}); + + // send body with "strange" unicode character + var body = {"cloneFromScm":"https://github.com/saasbook/ruby­-calisthenics"}; + client.request("POST", "/", body, function(err, res) { + assert(!err, err); + assert.equal(res, "OK"); + server.close(next); + }); + }); + }); +}); \ No newline at end of file From 26bbbc3c92ece8f3124dc600426a323f58c0ccd6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 11:37:32 +0200 Subject: [PATCH 390/476] c9-auto-bump 3.1.2003 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2ac28b1a..d6a073b3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2002", + "version": "3.1.2003", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2f5e7d43c29af1ceb3e2544a0db85545c78a1408 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 12:23:58 +0200 Subject: [PATCH 391/476] c9-auto-bump 3.1.2004 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d6a073b3..a5d40a81 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2003", + "version": "3.1.2004", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 28e4491c58ca64e9c8c31551765d338d524e9e74 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Thu, 31 Mar 2016 10:33:44 +0000 Subject: [PATCH 392/476] Don't complete on dot --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6197ae50..f946f26c 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", "c9.ide.language.html.diff": "#24f3608d26", - "c9.ide.language.javascript": "#038c0904af", + "c9.ide.language.javascript": "#d5167b037d", "c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.eslint": "#3c57ed1720", "c9.ide.language.javascript.tern": "#b55d0069bb", From f5b36659070ca2ff4a406af343b63c97682e18cc Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 12:35:14 +0200 Subject: [PATCH 393/476] c9-auto-bump 3.1.2005 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de8dd360..e36939ee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2004", + "version": "3.1.2005", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 225aa8a811bc341fce008da1ac2d778f80349b85 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 12:44:54 +0200 Subject: [PATCH 394/476] c9-auto-bump 3.1.2006 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eaa2a14b..b3815781 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2005", + "version": "3.1.2006", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c0993a2ec015df88b52750451ddee7f79522fb68 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 12:45:13 +0200 Subject: [PATCH 395/476] c9-auto-bump 3.1.2007 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7bf78b8d..bdd4c176 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2006", + "version": "3.1.2007", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 6cc2eaddee11c32002e3770448ca92bb958169d5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 12:45:28 +0200 Subject: [PATCH 396/476] c9-auto-bump 3.1.2008 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22110306..abb1283d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2007", + "version": "3.1.2008", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 31cad3118561b43bb29c1b673a794acb5b7bef5f Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 12:45:43 +0200 Subject: [PATCH 397/476] c9-auto-bump 3.1.2009 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f4aaf60..6d757ab8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2008", + "version": "3.1.2009", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a9e2c64ca4b6ff4f482df1451711c43eba9ef26c Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 12:58:41 +0200 Subject: [PATCH 398/476] c9-auto-bump 3.1.2010 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d757ab8..8df82796 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2009", + "version": "3.1.2010", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b3a4edaeb7efa100c2d4d0b3c0bf0ab0c2420a9a Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 31 Mar 2016 14:58:46 +0400 Subject: [PATCH 399/476] do not autoexpand hidden folder like .git or .c9 --- plugins/c9.ide.tree/tree.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js index 5a5e23ed..7aff77a6 100644 --- a/plugins/c9.ide.tree/tree.js +++ b/plugins/c9.ide.tree/tree.js @@ -461,7 +461,8 @@ define(function(require, exports, module) { var child = node.children[0]; if (!child || !child.isFolder || child.$depth > 0xff) return; - + if (fsCache.isFileHidden(child.path)) + return; if (isExpand && !child.isOpen) { expandNode(child); return true; From c4194aa0ff327793379f3e64f4c5a3a471ccb031 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 12:58:56 +0200 Subject: [PATCH 400/476] c9-auto-bump 3.1.2011 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8df82796..cd222eb0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2010", + "version": "3.1.2011", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 57355b8688ac8549fad2942fc73b08e565d64d77 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 13:00:24 +0200 Subject: [PATCH 401/476] c9-auto-bump 3.1.2012 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd222eb0..e5872c95 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2011", + "version": "3.1.2012", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 04e7e32910635bc93468cec55be2fbb244a30fc7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 13:02:08 +0200 Subject: [PATCH 402/476] c9-auto-bump 3.1.2013 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5872c95..c9a2f316 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2012", + "version": "3.1.2013", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 83d4661d19419c5af562a2a03a7e42695abfea98 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 13:44:27 +0200 Subject: [PATCH 403/476] c9-auto-bump 3.1.2014 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c9a2f316..6bdd28e0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2013", + "version": "3.1.2014", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0e17c64409e720597d803f9317a521504bde24f2 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 31 Mar 2016 16:27:34 +0400 Subject: [PATCH 404/476] fix regression in scopeAnalyzer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d757ab8..76885402 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "c9.ide.language.generic": "#3949510863", "c9.ide.language.html": "#22fdc74869", "c9.ide.language.html.diff": "#24f3608d26", - "c9.ide.language.javascript": "#5ad6cc8d35", + "c9.ide.language.javascript": "#e626169643", "c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.eslint": "#4de5457db1", "c9.ide.language.javascript.tern": "#b55d0069bb", From 86629ec2c1ffbaaa9e4359cff98cbf65ffe7e83a Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 14:35:13 +0200 Subject: [PATCH 405/476] c9-auto-bump 3.1.2015 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a99c757d..0234108e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2014", + "version": "3.1.2015", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 88094bc222c7c58f49e62b5d5702bb123d1ebe12 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 15:53:50 +0200 Subject: [PATCH 406/476] c9-auto-bump 3.1.2016 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48c9c2c0..4c85b143 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2015", + "version": "3.1.2016", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 15ff8b6f4099d15a23edf07f39c69434de690599 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 16:27:53 +0200 Subject: [PATCH 407/476] c9-auto-bump 3.1.2017 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c85b143..dcca15ee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2016", + "version": "3.1.2017", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 525d3e5b994ac44dfef8d159c52866b50c762050 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 31 Mar 2016 15:36:32 +0000 Subject: [PATCH 408/476] fix issue with vfs worker not passing falsy values --- node_modules/vfs-socket/worker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node_modules/vfs-socket/worker.js b/node_modules/vfs-socket/worker.js index 8cf0d3f4..ed7a282b 100644 --- a/node_modules/vfs-socket/worker.js +++ b/node_modules/vfs-socket/worker.js @@ -437,7 +437,7 @@ function Worker(vfs) { var keys = Object.keys(meta || {}); for (var i = 0, l = keys.length; i < l; i++) { var key = keys[i]; - if (!meta[key]) + if (meta[key] == undefined) continue; switch (key) { case "stream": token.stream = storeStream(meta.stream); break; From f904da1073ca866437f27bec173a9dfdeea2f487 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 31 Mar 2016 17:03:28 +0000 Subject: [PATCH 409/476] add test for execfile --- plugins/c9.fs/proc_test.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/plugins/c9.fs/proc_test.js b/plugins/c9.fs/proc_test.js index db68c57e..96be5406 100644 --- a/plugins/c9.fs/proc_test.js +++ b/plugins/c9.fs/proc_test.js @@ -37,7 +37,7 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai) describe('proc', function() { describe('spawn()', function() { - this.timeout(4000); + this.timeout(10000); it("should spawn a child process", function(done) { var args = ["-e", "process.stdin.pipe(process.stdout);try{process.stdin.resume()}catch(e) {};"]; @@ -66,8 +66,8 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai) }); }); - //should test the kill() method - which is broken now - //Another test - see that cwd defaults to the root vfs dir when resolve is set to true + // should test the kill() method - which is broken now + // Another test - see that cwd defaults to the root vfs dir when resolve is set to true }); describe('execFile()', function() { this.timeout(10000); @@ -101,8 +101,19 @@ require(["lib/architect/architect", "lib/chai/chai"], function (architect, chai) }); }); - //should test the kill() method - which is broken now - //Another test - see that cwd defaults to the root vfs dir when resolve is set to true + it('should pass stdout and stderr', function(done) { + proc.execFile("node", { + args: ["-v"] + }, function(e, stdout, stderr) { + expect(stdout[0]).to.equal("v"); + expect(stderr).to.equal(""); + expect(e).to.not.ok; + done(); + }); + }); + + // should test the kill() method - which is broken now + // Another test - see that cwd defaults to the root vfs dir when resolve is set to true }); describe('pty()', function() { this.timeout(30000); From d12e968aacdd32f116cd996bd26683803ab395b3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 21:19:15 +0200 Subject: [PATCH 410/476] c9-auto-bump 3.1.2018 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dcca15ee..c2e23c5f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2017", + "version": "3.1.2018", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7e9eb820fb1040c81d653cbe0ccc24e41e3d2c40 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Thu, 31 Mar 2016 15:30:51 -0400 Subject: [PATCH 411/476] Revert "Upgrade asyncjs to 1.5.2" --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c2e23c5f..9a770cdc 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "acorn": "2.5.2", - "async": "^1.5.2", + "async": "^0.9.0", "base64id": "~0.1.0", "connect": "~2.12.0", "debug": "~0.7.4", From 23bcdd5c0395b8ed64cc8f8c5d8fd1d2d0a8d079 Mon Sep 17 00:00:00 2001 From: c9bot Date: Thu, 31 Mar 2016 21:32:37 +0200 Subject: [PATCH 412/476] c9-auto-bump 3.1.2019 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9a770cdc..4d297fe2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2018", + "version": "3.1.2019", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e7c8831e7a0e301992c5c494fc532d33462cbf55 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 09:10:54 +0200 Subject: [PATCH 413/476] c9-auto-bump 3.1.2020 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d297fe2..85fd9def 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2019", + "version": "3.1.2020", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b60094894118e6025989b28d41e9094603435549 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 09:13:46 +0200 Subject: [PATCH 414/476] c9-auto-bump 3.1.2021 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 85fd9def..222e57da 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2020", + "version": "3.1.2021", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1a2ff9e7c475ad53b7f7abeca93501dea4e9e5d5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 09:14:36 +0200 Subject: [PATCH 415/476] c9-auto-bump 3.1.2022 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 222e57da..568631b5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2021", + "version": "3.1.2022", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7113ba84eacd53540c81fa44616cf7a5704f5e40 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 09:15:51 +0200 Subject: [PATCH 416/476] c9-auto-bump 3.1.2023 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 568631b5..d1e79817 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2022", + "version": "3.1.2023", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 8ae4c49ed6d6fd0a0ad65d995f80cf30520ae0ed Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 09:22:21 +0200 Subject: [PATCH 417/476] c9-auto-bump 3.1.2024 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d1e79817..eb29f59e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2023", + "version": "3.1.2024", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 949248f4b047dccc4944108868b76e6e94361e19 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 09:55:44 +0200 Subject: [PATCH 418/476] c9-auto-bump 3.1.2025 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb29f59e..07985cf6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2024", + "version": "3.1.2025", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a93caa160699b808ac1e6906c6e5321c7d3c48c2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 10:28:51 +0200 Subject: [PATCH 419/476] c9-auto-bump 3.1.2026 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 07985cf6..3cd0fb34 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2025", + "version": "3.1.2026", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a39145b74801043a94f80f8b49ca2c00b3560390 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 10:36:51 +0200 Subject: [PATCH 420/476] c9-auto-bump 3.1.2027 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3cd0fb34..dec89f56 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2026", + "version": "3.1.2027", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 929ee23d40884109bfd8d72ba736cf3d3bf60d94 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 12:38:49 +0200 Subject: [PATCH 421/476] c9-auto-bump 3.1.2028 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dec89f56..5d630deb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2027", + "version": "3.1.2028", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 928d1c31b9e43954064d0862e176aec2c9ec8e81 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 13:58:56 +0200 Subject: [PATCH 422/476] c9-auto-bump 3.1.2029 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5d630deb..f40dce86 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2028", + "version": "3.1.2029", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ef56994d6468bbe823467ba4098a106e5e7eab6a Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 14:22:33 +0200 Subject: [PATCH 423/476] c9-auto-bump 3.1.2030 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f40dce86..dc7e1610 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2029", + "version": "3.1.2030", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 0fcf0f7510e7fa0358f1bc868970e4b88b31d6bd Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 14:30:54 +0200 Subject: [PATCH 424/476] c9-auto-bump 3.1.2031 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc7e1610..a6bdd788 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2030", + "version": "3.1.2031", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c03bcb9530745c025008ff8006ef5041208405c6 Mon Sep 17 00:00:00 2001 From: Matthijs van Henten Date: Fri, 1 Apr 2016 15:45:53 +0200 Subject: [PATCH 425/476] Revert "Fix VFS container activation timeout behavior" --- node_modules/c9/rest_client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node_modules/c9/rest_client.js b/node_modules/c9/rest_client.js index 7531fd03..0aec2fff 100644 --- a/node_modules/c9/rest_client.js +++ b/node_modules/c9/rest_client.js @@ -145,4 +145,4 @@ function RestClient(host, port, config) { } } -module.exports = RestClient; \ No newline at end of file +module.exports = RestClient; From 9f42081b8fd1729b2f3117afc444eb2a4409a798 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 15:46:46 +0200 Subject: [PATCH 426/476] c9-auto-bump 3.1.2032 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a6bdd788..72dec48d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2031", + "version": "3.1.2032", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f4fb88845296602e8409406898d7e321cee4f946 Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 16:40:31 +0200 Subject: [PATCH 427/476] c9-auto-bump 3.1.2033 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72dec48d..1745cbef 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2032", + "version": "3.1.2033", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 13328e14c078aa8ad85ea8bf3d49d965e8939bac Mon Sep 17 00:00:00 2001 From: c9bot Date: Fri, 1 Apr 2016 18:22:59 +0200 Subject: [PATCH 428/476] c9-auto-bump 3.1.2034 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1745cbef..53745965 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2033", + "version": "3.1.2034", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7ec5491b09496f99115a1250124edf6c037e905d Mon Sep 17 00:00:00 2001 From: c9bot Date: Sat, 2 Apr 2016 00:40:12 +0200 Subject: [PATCH 429/476] c9-auto-bump 3.1.2035 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 53745965..2acd6750 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2034", + "version": "3.1.2035", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 40854a89b738dd5691fba2dc6dde22ae656d694b Mon Sep 17 00:00:00 2001 From: c9bot Date: Sat, 2 Apr 2016 21:21:30 +0200 Subject: [PATCH 430/476] c9-auto-bump 3.1.2036 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2acd6750..2aecc688 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2035", + "version": "3.1.2036", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From ec6b764668ffee45a7767c2ddf178dae2afbda72 Mon Sep 17 00:00:00 2001 From: c9bot Date: Sun, 3 Apr 2016 23:34:23 +0200 Subject: [PATCH 431/476] c9-auto-bump 3.1.2037 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2aecc688..b4d26127 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2036", + "version": "3.1.2037", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d3f65148fe02f56ee7c2fed7cea77cd8059ac53c Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 02:13:38 +0400 Subject: [PATCH 432/476] fix regression in env popup --- node_modules/ace_tree/lib/ace_tree/edit.js | 5 +++-- plugins/c9.ide.tree/tree.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/node_modules/ace_tree/lib/ace_tree/edit.js b/node_modules/ace_tree/lib/ace_tree/edit.js index 09bb8dfb..a76f115f 100644 --- a/node_modules/ace_tree/lib/ace_tree/edit.js +++ b/node_modules/ace_tree/lib/ace_tree/edit.js @@ -258,6 +258,7 @@ var EditableTree = function(tree) { var ace = this.ace; this.ace = null; + this.$lastAce = ace; ace.renderer.freeze(); setTimeout(function() { // doing this after timeout to allow rename event focus something else @@ -267,6 +268,7 @@ var EditableTree = function(tree) { ace.wrapper.parentNode.removeChild(ace.wrapper); if (wasFocused) this.tree.focus(); + this.$lastAce = null; }.bind(this)); }; @@ -386,6 +388,7 @@ var EditableTree = function(tree) { var val = this.ace.getValue(); + this._destroyEditor(); if (!cancel && this.origVal !== val) { this.tree._emit("rename", { @@ -396,8 +399,6 @@ var EditableTree = function(tree) { }); this.tree.provider._signal("change"); } - - this._destroyEditor(); }; }).call(EditableTree.prototype); diff --git a/plugins/c9.ide.tree/tree.js b/plugins/c9.ide.tree/tree.js index 7aff77a6..34187998 100644 --- a/plugins/c9.ide.tree/tree.js +++ b/plugins/c9.ide.tree/tree.js @@ -520,7 +520,7 @@ define(function(require, exports, module) { } if (dirname(newpath) != dirname(path)) { - tree.edit.ace.blur(); // TODO this shouldn't be needed when apf focus works + tree.edit.$lastAce && tree.edit.$lastAce.blur(); // TODO this shouldn't be needed when apf focus works question( "Confirm move to a new folder", "move '" + e.oldValue + "' to \n" + From a6c0bd6e2492188b607c366bd86de60dbb770b52 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 02:14:53 +0400 Subject: [PATCH 433/476] fix misaligned label in preview switcher --- plugins/c9.ide.layout.classic/less/btn-switcher.less | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/c9.ide.layout.classic/less/btn-switcher.less b/plugins/c9.ide.layout.classic/less/btn-switcher.less index 3af6342c..74e4a5cc 100644 --- a/plugins/c9.ide.layout.classic/less/btn-switcher.less +++ b/plugins/c9.ide.layout.classic/less/btn-switcher.less @@ -1,8 +1,10 @@ .btn-switcher { .user-select(none); - + -webkit-display: flex; + display: flex; + -webkit-align-items: center; + align-items: center; cursor: default; - line-height: 19px; font-size: @preview-chooser-font-size; font-weight: @preview-chooser-font-weight; color: ; @@ -46,6 +48,5 @@ .btn-switcherIcon { background-repeat: no-repeat; padding-left: 25px; - padding-top: 5px; - background-position: 5px 6px; + background-position: 5px 50% } \ No newline at end of file From 9c829d23d797630cfb5b85b67a040488fb036883 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 03:14:19 +0400 Subject: [PATCH 434/476] fix error in twoway diff viewer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2aecc688..55f274f5 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#219b66019a", + "c9.ide.scm": "#637a68cd04", "c9.ide.terminal.monitor": "#affa33572f", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2", From 00174eb6689da2a4832e965df336591325d6c3a9 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 03:28:51 +0400 Subject: [PATCH 435/476] fix paste in terminal --- plugins/c9.ide.terminal/aceterm/input.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.terminal/aceterm/input.js b/plugins/c9.ide.terminal/aceterm/input.js index 18289eb8..424afcbd 100644 --- a/plugins/c9.ide.terminal/aceterm/input.js +++ b/plugins/c9.ide.terminal/aceterm/input.js @@ -221,7 +221,7 @@ define(function(require, exports, module) { }]); ace.onPaste = function(text) { - this.send(text.replace(/\r\n/g, "\n")); + this.send(text.replace(/\r\n?|\n/g, this.session.term.convertEol ? "\n" : "\r")); }; ace.setKeyboardHandler(this); From 49fb42964c849113fb54ad46e3b38417b43bb23e Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 4 Apr 2016 03:29:43 +0400 Subject: [PATCH 436/476] fix resizing of output panes on windows --- node_modules/vfs-local/localfs.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js index 0805a6cd..6885fefa 100644 --- a/node_modules/vfs-local/localfs.js +++ b/node_modules/vfs-local/localfs.js @@ -1562,7 +1562,7 @@ module.exports = function setup(fsOptions) { // todo add resize event proc.emit("data", {rows: rows, cols: cols}); - if (!tmuxWarned) { + if (!tmuxWarned && !isWin) { if (/v0\.([123456789]\..*|10\.(0|1|2[0-7]))/.test(process.version)) { proc.emit("data", { message: "Wrong Node.js version: " + process.version, @@ -2020,7 +2020,8 @@ module.exports = function setup(fsOptions) { }; this.resize = function() { - return pty.resize.apply(pty, arguments); + if (!exited) + return pty.resize.apply(pty, arguments); }; // this.acknowledgeWrite = function(callback) { From b49f9e4f7d59907007a85c234a45d77f2b580abd Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 06:33:55 +0200 Subject: [PATCH 437/476] c9-auto-bump 3.1.2038 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4d26127..92acaa9d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2037", + "version": "3.1.2038", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 49b23ec7e1bc36221e0e0b9c8bea4f8b33aac7b6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 10:17:05 +0200 Subject: [PATCH 438/476] c9-auto-bump 3.1.2039 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92acaa9d..f09b11ad 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2038", + "version": "3.1.2039", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4d6c0aff7684d37afb0ad9aafc98fac003c4ccd6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 11:53:59 +0200 Subject: [PATCH 439/476] c9-auto-bump 3.1.2040 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f09b11ad..fae5a834 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2039", + "version": "3.1.2040", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From acfad9413efd0603209fd5f8650330bf1aca05b7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 12:27:57 +0200 Subject: [PATCH 440/476] c9-auto-bump 3.1.2041 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fae5a834..7cc11fc5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2040", + "version": "3.1.2041", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From e4a6df9b0fe925b9ea4b1a97a57c7e2938e5b2d8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 12:52:53 +0200 Subject: [PATCH 441/476] c9-auto-bump 3.1.2042 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7cc11fc5..64025a56 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2041", + "version": "3.1.2042", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a5f8780a0b8b6e09ae2ba7624f6c4424572d9fb8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:10:01 +0200 Subject: [PATCH 442/476] c9-auto-bump 3.1.2043 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 64025a56..ea44b98a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2042", + "version": "3.1.2043", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 26e1eeac33eee2361d13dfb7d167a2b176919ef1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:26:38 +0200 Subject: [PATCH 443/476] c9-auto-bump 3.1.2044 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea44b98a..4d707768 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2043", + "version": "3.1.2044", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 32043d276c84834d410ea34e4ddf2ac41aeb6be1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:27:32 +0200 Subject: [PATCH 444/476] c9-auto-bump 3.1.2045 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d707768..397cd673 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2044", + "version": "3.1.2045", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f4659dec45bb310c955db0ee9a00f18c46ebb559 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:38:04 +0200 Subject: [PATCH 445/476] c9-auto-bump 3.1.2046 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 397cd673..552401d6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2045", + "version": "3.1.2046", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 10e9b87a0427f9907918da56bc32fde4043690ad Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:39:59 +0200 Subject: [PATCH 446/476] c9-auto-bump 3.1.2047 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 552401d6..13021900 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2046", + "version": "3.1.2047", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2d653f00b1afe8b2cac2730c606f6254aa3e1a94 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:40:19 +0200 Subject: [PATCH 447/476] c9-auto-bump 3.1.2048 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bb9015b9..684a4c0c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2047", + "version": "3.1.2048", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 76fac67683f3426116cd77a1fed59ecd41bf50e8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:56:30 +0200 Subject: [PATCH 448/476] c9-auto-bump 3.1.2049 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 684a4c0c..ce0da967 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2048", + "version": "3.1.2049", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 4432e39fa024f50110b0a19a54128dfe6988b683 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 14:58:37 +0200 Subject: [PATCH 449/476] c9-auto-bump 3.1.2050 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ce0da967..c85688cb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2049", + "version": "3.1.2050", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 5437fcde18c2f90baead2a3e76389bd563b934ea Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 15:00:36 +0200 Subject: [PATCH 450/476] c9-auto-bump 3.1.2051 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c85688cb..0f3b2973 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2050", + "version": "3.1.2051", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 53034fd49972d56d73b427df5286d1c34f3dd823 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 15:01:50 +0200 Subject: [PATCH 451/476] c9-auto-bump 3.1.2052 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f3b2973..fabd08cb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2051", + "version": "3.1.2052", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 403688af6b464adf58b0b31372c7a9f31fafe9d6 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 16:25:46 +0200 Subject: [PATCH 452/476] c9-auto-bump 3.1.2053 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fabd08cb..038ea488 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2052", + "version": "3.1.2053", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c86ecd856ec39ef94c735078be677ab93c2dc213 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 16:28:48 +0200 Subject: [PATCH 453/476] c9-auto-bump 3.1.2054 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 038ea488..5b674e6c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2053", + "version": "3.1.2054", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fb1cec777054cb38e8b0bc775255a37f4d64463f Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 16:41:09 +0200 Subject: [PATCH 454/476] c9-auto-bump 3.1.2055 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5b674e6c..49301eb3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2054", + "version": "3.1.2055", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bb3238226f60b358afc0f09f71f52d10be51db19 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 17:29:50 +0200 Subject: [PATCH 455/476] c9-auto-bump 3.1.2056 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49301eb3..bcf167fb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2055", + "version": "3.1.2056", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 83e38fddb568fcd7c0bb4ee3c4889b594cba36a5 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 20:30:27 +0200 Subject: [PATCH 456/476] c9-auto-bump 3.1.2057 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bcf167fb..9f958dc4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2056", + "version": "3.1.2057", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 95a1ca074b26092d587e354d02730850ef8a804e Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 21:48:20 +0200 Subject: [PATCH 457/476] c9-auto-bump 3.1.2058 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f958dc4..413ad340 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2057", + "version": "3.1.2058", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3e36496e3a1114019deca00b487dff5a8eca68f4 Mon Sep 17 00:00:00 2001 From: c9bot Date: Mon, 4 Apr 2016 21:49:12 +0200 Subject: [PATCH 458/476] c9-auto-bump 3.1.2059 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 413ad340..28442914 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2058", + "version": "3.1.2059", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 7ac8ae99eea9c65d98b5695a6f26a2e19832ffc2 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 09:58:13 +0200 Subject: [PATCH 459/476] c9-auto-bump 3.1.2060 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28442914..5bffc75d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2059", + "version": "3.1.2060", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3b59c0fa08721964ddf71168d3a66b5e91f6a71f Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 11:26:09 +0200 Subject: [PATCH 460/476] c9-auto-bump 3.1.2061 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5bffc75d..ad75ce28 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2060", + "version": "3.1.2061", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 493e055d09786db318e42a989804aceec9911bad Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 12:36:13 +0200 Subject: [PATCH 461/476] c9-auto-bump 3.1.2062 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad75ce28..a0f5a6f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2061", + "version": "3.1.2062", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From fa788c79c3f4656c2b99583f326ac0c7224e1d45 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 14:10:32 +0200 Subject: [PATCH 462/476] c9-auto-bump 3.1.2063 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a0f5a6f3..27458be1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2062", + "version": "3.1.2063", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1920a08e214c92dbc9e827375e79b7a6128c6013 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 14:16:40 +0200 Subject: [PATCH 463/476] c9-auto-bump 3.1.2064 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27458be1..83875612 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2063", + "version": "3.1.2064", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 93edc13d4200262feebf512fe1155eebe27e46b1 Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 17:39:16 +0200 Subject: [PATCH 464/476] c9-auto-bump 3.1.2065 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 83875612..d93defa4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2064", + "version": "3.1.2065", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 54c73068c797d3dd323d0ec8d2adcf5314c8101c Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 18:54:28 +0200 Subject: [PATCH 465/476] c9-auto-bump 3.1.2066 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d93defa4..8c92ef60 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2065", + "version": "3.1.2066", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 30db19405e2e4da2b6cc68ab92c61a20d5afc73c Mon Sep 17 00:00:00 2001 From: c9bot Date: Tue, 5 Apr 2016 19:45:07 +0200 Subject: [PATCH 466/476] c9-auto-bump 3.1.2067 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c92ef60..5c0e19c4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2066", + "version": "3.1.2067", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f2fd12c9dabb04429ab61eb1ea057b55439c5dcf Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 09:54:26 +0200 Subject: [PATCH 467/476] c9-auto-bump 3.1.2068 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c0e19c4..8ac096fc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2067", + "version": "3.1.2068", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From f218a50c5f9a81ee5ced65fe8b3255e6e378eb1b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 10:43:44 +0200 Subject: [PATCH 468/476] c9-auto-bump 3.1.2069 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8ac096fc..9458b713 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2068", + "version": "3.1.2069", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 04cd4eb59ef4605ae361cab5056a34d8a73b939f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 11:09:20 +0200 Subject: [PATCH 469/476] c9-auto-bump 3.1.2070 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9458b713..92b44d80 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2069", + "version": "3.1.2070", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 66eb6f8d9fc6989e8ac33d243fbd87839279d94b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 11:09:40 +0200 Subject: [PATCH 470/476] c9-auto-bump 3.1.2071 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92b44d80..3b085fb3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2070", + "version": "3.1.2071", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 33f9379edd912f7fe9d3bfda8a66d7d5fcbccabf Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 11:31:40 +0200 Subject: [PATCH 471/476] c9-auto-bump 3.1.2072 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b085fb3..59af5b0a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2071", + "version": "3.1.2072", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From bff017ea0c7f30b583b1209d926140382a0969b9 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 11:37:44 +0200 Subject: [PATCH 472/476] c9-auto-bump 3.1.2073 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 59af5b0a..3e6eba55 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2072", + "version": "3.1.2073", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a6f0bbd5ddaf07a22510db4c93b01d89962fd703 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 6 Apr 2016 12:46:23 +0200 Subject: [PATCH 473/476] c9-auto-bump 3.1.2074 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e6eba55..48c1ae7d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.2073", + "version": "3.1.2074", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 071e3307dabdb226dbcecd2e2855ecea64f9f756 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 6 Apr 2016 10:55:20 +0000 Subject: [PATCH 474/476] Add settings to enable/disable completion --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 567b28f3..06a45c97 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#84122055ba", + "c9.ide.language.codeintel": "#c6741dc41e", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", @@ -91,7 +91,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#19758abe08", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#330b80e3b2", + "c9.ide.language.python": "#a001e72a4b", "c9.ide.language.go": "#6ce1c7a7ef", "c9.ide.mount": "#4c39359b87", "c9.ide.navigate": "#1fbb7cd53b", From 7aa6db901c0e59084569b4248c6f093e3cbcea5f Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 6 Apr 2016 11:40:53 +0000 Subject: [PATCH 475/476] Add extra labels --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 06a45c97..013a3419 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#8d02f86043", + "c9.ide.language": "#b392f03a6c", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", @@ -63,10 +63,10 @@ "c9.ide.language.javascript": "#d1a479805c", "c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.eslint": "#3c57ed1720", - "c9.ide.language.javascript.tern": "#b55d0069bb", + "c9.ide.language.javascript.tern": "#64ab01f271", "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#c6741dc41e", + "c9.ide.language.codeintel": "#72157892e4", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", @@ -91,7 +91,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#19758abe08", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#a001e72a4b", + "c9.ide.language.python": "#701bd2630a", "c9.ide.language.go": "#6ce1c7a7ef", "c9.ide.mount": "#4c39359b87", "c9.ide.navigate": "#1fbb7cd53b", From be12aad1bd121022017995cd097006508863729c Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 7 Apr 2016 12:38:02 +0200 Subject: [PATCH 476/476] Fix tests --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d6efb58..8f94b865 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#e058ff301f", + "c9.ide.language": "#742877e271", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#3949510863", "c9.ide.language.html": "#22fdc74869",