From 42d069225adf474d1ce7989b7575d9cc2d1c93ed Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 13 Nov 2015 13:21:21 +0100 Subject: [PATCH 1/5] Revert "Revert markdown changes" --- node_modules/ace/lib/ace/ext/static_highlight.js | 2 +- package.json | 4 ++-- plugins/c9.fs/fs.errors.js | 2 ++ plugins/c9.ide.layout.classic/less/splitter.less | 2 +- plugins/c9.ide.terminal/terminal.js | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/node_modules/ace/lib/ace/ext/static_highlight.js b/node_modules/ace/lib/ace/ext/static_highlight.js index 2acb3ac5..fc1928fc 100644 --- a/node_modules/ace/lib/ace/ext/static_highlight.js +++ b/node_modules/ace/lib/ace/ext/static_highlight.js @@ -187,5 +187,5 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) { }; module.exports = highlight; -module.exports.highlight =highlight; +module.exports.highlight = highlight; }); diff --git a/package.json b/package.json index 038516ea..f977d383 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "c9.ide.openfiles": "#7fa4a97fed", "c9.ide.preview": "#72a4521169", "c9.ide.preview.browser": "#cec211a76a", - "c9.ide.preview.markdown": "#8ed82f1197", + "c9.ide.preview.markdown": "#144b154bab", "c9.ide.pubsub": "#a85fb27eca", "c9.ide.readonly": "#e67bb593bd", "c9.ide.recentfiles": "#7c099abf40", @@ -106,7 +106,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#61dcbd0180", "c9.ide.save": "#76cf52ab6d", - "c9.ide.scm": "#7b0f69a149", + "c9.ide.scm": "#5e511d1365", "c9.ide.terminal.monitor": "#b76f1c9f24", "c9.ide.test": "#a1c0d9e5e0", "c9.ide.test.mocha": "#586fb0cdc2", diff --git a/plugins/c9.fs/fs.errors.js b/plugins/c9.fs/fs.errors.js index 595c05e7..299814a0 100644 --- a/plugins/c9.fs/fs.errors.js +++ b/plugins/c9.fs/fs.errors.js @@ -51,6 +51,7 @@ define(function(require, exports, module) { "ENOTDIR" : "{Totype|type} {to|filename} is not a directory", "EEXIST" : "{Totype|type} {to|filename} already exists", "EACCES" : "Access denied acccessing this {type}", + "ENOSPC" : "Your disk is full. Please create more space. Could not write {filename}", "EDISCONNECT" : "The connection went away. Please try again.", "ENOTCONNECTED" : "You are disconnected. " + "Please check your connection and try again" @@ -81,6 +82,7 @@ define(function(require, exports, module) { fs.on("userError", function(e) { if (!m[e.name]) return; + if (e.error.code == "EEXIST") return; var args = e.args; var path = args[0]; diff --git a/plugins/c9.ide.layout.classic/less/splitter.less b/plugins/c9.ide.layout.classic/less/splitter.less index 928f487c..466d46d5 100644 --- a/plugins/c9.ide.layout.classic/less/splitter.less +++ b/plugins/c9.ide.layout.classic/less/splitter.less @@ -1,6 +1,6 @@ .splitter { position : relative; - z-index : 10000; + z-index : 100000; .box-sizing(border-box); } diff --git a/plugins/c9.ide.terminal/terminal.js b/plugins/c9.ide.terminal/terminal.js index 0e7fd763..9ae0d835 100644 --- a/plugins/c9.ide.terminal/terminal.js +++ b/plugins/c9.ide.terminal/terminal.js @@ -262,7 +262,7 @@ define(function(require, exports, module) { ["fontfamily", "Ubuntu Mono, Menlo, Consolas, monospace"], // Monaco, ["fontsize", "12"], ["blinking", "false"], - ["scrollback", 10000] + ["scrollback", 1000] ]); setSettings(); From db978748a851f5bb8087ace355b6854a53005fb5 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Fri, 13 Nov 2015 18:00:31 +0000 Subject: [PATCH 2/5] fixes markdown preview when file is not opened --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f977d383..1b0cb966 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "c9.ide.openfiles": "#7fa4a97fed", "c9.ide.preview": "#72a4521169", "c9.ide.preview.browser": "#cec211a76a", - "c9.ide.preview.markdown": "#144b154bab", + "c9.ide.preview.markdown": "#58352ce683", "c9.ide.pubsub": "#a85fb27eca", "c9.ide.readonly": "#e67bb593bd", "c9.ide.recentfiles": "#7c099abf40", From 07931dc781b0dca2ab3f1e904c878d029390ea19 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Fri, 13 Nov 2015 20:42:49 +0000 Subject: [PATCH 3/5] Reconnect previewed tabs as they are created and destroyed --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1b0cb966..32b3f525 100644 --- a/package.json +++ b/package.json @@ -94,9 +94,9 @@ "c9.ide.navigate": "#c191d9b92f", "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#7fa4a97fed", - "c9.ide.preview": "#72a4521169", + "c9.ide.preview": "#23b5e2149d", "c9.ide.preview.browser": "#cec211a76a", - "c9.ide.preview.markdown": "#58352ce683", + "c9.ide.preview.markdown": "#26a35d8e39", "c9.ide.pubsub": "#a85fb27eca", "c9.ide.readonly": "#e67bb593bd", "c9.ide.recentfiles": "#7c099abf40", From f46d1b68396e30fa515435c7df3da412921c683d Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Fri, 13 Nov 2015 23:30:01 +0000 Subject: [PATCH 4/5] clean up ace session hook --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 32b3f525..4d12974f 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "c9.ide.openfiles": "#7fa4a97fed", "c9.ide.preview": "#23b5e2149d", "c9.ide.preview.browser": "#cec211a76a", - "c9.ide.preview.markdown": "#26a35d8e39", + "c9.ide.preview.markdown": "#fa98ff2743", "c9.ide.pubsub": "#a85fb27eca", "c9.ide.readonly": "#e67bb593bd", "c9.ide.recentfiles": "#7c099abf40", From 294d6aef9e589bfe46a5230ba2560664ff00bcbf Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Wed, 18 Nov 2015 16:25:49 +0000 Subject: [PATCH 5/5] Set fixed theme --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76f1d140..715be732 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "c9.ide.openfiles": "#7fa4a97fed", "c9.ide.preview": "#23b5e2149d", "c9.ide.preview.browser": "#cec211a76a", - "c9.ide.preview.markdown": "#fa98ff2743", + "c9.ide.preview.markdown": "#bc846e1562", "c9.ide.pubsub": "#a85fb27eca", "c9.ide.readonly": "#e67bb593bd", "c9.ide.recentfiles": "#7c099abf40",