From 351af82d49cf80a08809c0088bf6dfcb05d06bdb Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 25 Jan 2016 13:58:46 +0400 Subject: [PATCH 1/7] fix silent flag for tree expand --- node_modules/ace_tree/lib/ace_tree/data_provider.js | 4 ++-- 1 file changed, 2 insertions(+), 2 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 32d2f0ea..4709fe1c 100644 --- a/node_modules/ace_tree/lib/ace_tree/data_provider.js +++ b/node_modules/ace_tree/lib/ace_tree/data_provider.js @@ -89,9 +89,9 @@ var DataProvider = function(root) { var childNode = ch[j]; if (this.isOpen(childNode)) { this.setOpen(childNode, false); - this.open(childNode, deep - 1); + this.open(childNode, deep - 1, silent); } else if (deep > 0) { - this.open(childNode, deep - 1); + this.open(childNode, deep - 1, silent); } } From afd8cd354fbd8e4e34d1d7d252a47fff37f61d13 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 25 Jan 2016 14:39:15 +0400 Subject: [PATCH 2/7] remove raygun warning about mtime --- plugins/c9.fs/fs.cache.xml.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js index da06cc24..de85131e 100644 --- a/plugins/c9.fs/fs.cache.xml.js +++ b/plugins/c9.fs/fs.cache.xml.js @@ -574,7 +574,10 @@ define(function(require, exports, module) { node.contenttype = stat.mime || util.getContentType(name); node.status = "loaded"; } - + if (typeof stat.mtime !== "number" && stat.mtime) { + // TODO fix localfs to not send date objects here + stat.mtime = +stat.mtime; + } if (stat.size != undefined) node.size = stat.size; if (stat.mtime != undefined) @@ -594,14 +597,6 @@ define(function(require, exports, module) { node.children = null; - if (typeof node.mtime !== "number" && node.mtime) { - // why Date ends up here? - reportError(new Error("Date in fs cache"), { - stat: stat, - mtime: node.mtime, - path: node.path - }); - } if (!updating) { if (!modified.length) modified.push(parent); From eb39399a6d13372e152edc20402a3500edcc5c65 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 25 Jan 2016 14:39:59 +0400 Subject: [PATCH 3/7] fix opening pdf files --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 60a8ecc5..334c5049 100644 --- a/package.json +++ b/package.json @@ -97,8 +97,8 @@ "c9.ide.navigate": "#1fbb7cd53b", "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#2ae85a9e33", - "c9.ide.preview": "#8f87ff2f6a", - "c9.ide.preview.browser": "#c5b9a129de", + "c9.ide.preview": "#2acbe41e62", + "c9.ide.preview.browser": "#04760484d1", "c9.ide.preview.markdown": "#bc846e1562", "c9.ide.pubsub": "#a85fb27eca", "c9.ide.readonly": "#e67bb593bd", From 1c4dc45c9456a6986ad566d8a6dd8c03eb388810 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 25 Jan 2016 20:16:58 +0400 Subject: [PATCH 4/7] fix terminal monitor not working for wrapped lines --- package.json | 2 +- plugins/c9.ide.terminal/aceterm/libterm.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 334c5049..b44c8b0b 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "c9.ide.run.debug.xdebug": "#a1b39e0ac4", "c9.ide.save": "#1ab1840513", "c9.ide.scm": "#ca3c94b84f", - "c9.ide.terminal.monitor": "#a0d1f02991", + "c9.ide.terminal.monitor": "#021b290e91", "c9.ide.test": "#a282ec1619", "c9.ide.test.mocha": "#fc053b23d2", "c9.ide.theme.flat": "#81dadeee55", diff --git a/plugins/c9.ide.terminal/aceterm/libterm.js b/plugins/c9.ide.terminal/aceterm/libterm.js index 98a28b5d..4f30c487 100644 --- a/plugins/c9.ide.terminal/aceterm/libterm.js +++ b/plugins/c9.ide.terminal/aceterm/libterm.js @@ -301,8 +301,10 @@ Terminal.prototype.scroll = function() {//TODO optimize lines var row; if (++this.ybase === Terminal.scrollback) { - this.ybase = this.ybase / 2 | 0; - this.lines = this.lines.slice(-(this.ybase + this.rows) + 1); + var lineCount = this.ybase / 2 | 0; + this.emit("discardOldScrollback", lineCount); + this.ybase -= lineCount; + this.lines = this.lines.slice(lineCount); } this.ydisp = this.ybase; From eb1595363a306f7dfbb54b804d6f0d4afaa09572 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 25 Jan 2016 20:17:26 +0400 Subject: [PATCH 5/7] allow custom onmatch actions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b44c8b0b..aad195dc 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "c9.ide.run.debug.xdebug": "#a1b39e0ac4", "c9.ide.save": "#1ab1840513", "c9.ide.scm": "#ca3c94b84f", - "c9.ide.terminal.monitor": "#021b290e91", + "c9.ide.terminal.monitor": "#653e0b7ef1", "c9.ide.test": "#a282ec1619", "c9.ide.test.mocha": "#fc053b23d2", "c9.ide.theme.flat": "#81dadeee55", From 5c5a22c99c4a563e2c2bfc2c0fd8852016d596ce Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 27 Jan 2016 00:54:50 +0400 Subject: [PATCH 6/7] ctrl-\ should send SIGQUIT --- plugins/c9.ide.keys/commands.js | 1 + plugins/c9.ide.terminal/aceterm/input.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/c9.ide.keys/commands.js b/plugins/c9.ide.keys/commands.js index b95d6d6c..0cab430e 100644 --- a/plugins/c9.ide.keys/commands.js +++ b/plugins/c9.ide.keys/commands.js @@ -321,6 +321,7 @@ define(function(require, exports, module) { }, commands.openpreferences, commands.passKeysToBrowser, + commands.commands, commands.find, commands.openterminal, commands.navigate, diff --git a/plugins/c9.ide.terminal/aceterm/input.js b/plugins/c9.ide.terminal/aceterm/input.js index 2fb3e2bc..18289eb8 100644 --- a/plugins/c9.ide.terminal/aceterm/input.js +++ b/plugins/c9.ide.terminal/aceterm/input.js @@ -1,6 +1,7 @@ define(function(require, exports, module) { var isWindows = require("ace/lib/useragent").isWindows; module.exports = function initInput(ace) { + // use showkey --ascii to test var HashHandler = require("ace/keyboard/hash_handler").HashHandler; var KEY_MODS = require("ace/lib/keys").KEY_MODS; var TERM_MODS = { @@ -98,7 +99,7 @@ define(function(require, exports, module) { if (isControl) { if (keyCode >= 65 && keyCode <= 90) { key = String.fromCharCode(keyCode - 64); - } else if (keyCode === 32) { + } else if (keyCode === 32 || keyCode == 192) { // NUL key = String.fromCharCode(0); } else if (keyCode >= 51 && keyCode <= 55) { @@ -116,6 +117,9 @@ define(function(require, exports, module) { } else if (keyCode === 189 || keyCode === 173) { // _ key = String.fromCharCode(31); + } else if (keyCode === 220) { + // SIGQUIT + key = String.fromCharCode(28); } } else if (isMeta) { if (keyCode >= 65 && keyCode <= 90) { From b28526ce8ef4fe5a0d6355b2ea6889e23b74e639 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 27 Jan 2016 03:11:25 +0400 Subject: [PATCH 7/7] show messages for inactive tabs, add reloadPreview for google --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aad195dc..5999738b 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "c9.ide.run.debug.xdebug": "#a1b39e0ac4", "c9.ide.save": "#1ab1840513", "c9.ide.scm": "#ca3c94b84f", - "c9.ide.terminal.monitor": "#653e0b7ef1", + "c9.ide.terminal.monitor": "#1ccac33b0d", "c9.ide.test": "#a282ec1619", "c9.ide.test.mocha": "#fc053b23d2", "c9.ide.theme.flat": "#81dadeee55",