From 917b66c07263819feee96a775ea07129ca3658c3 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sat, 12 Sep 2015 18:55:30 +0000 Subject: [PATCH 1/5] Allow isHTML for questions, too --- plugins/c9.ide.dialog.common/question.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.ide.dialog.common/question.js b/plugins/c9.ide.dialog.common/question.js index 705331ce..7ebd194a 100644 --- a/plugins/c9.ide.dialog.common/question.js +++ b/plugins/c9.ide.dialog.common/question.js @@ -37,8 +37,8 @@ define(function(require, module, exports) { var metadata = options.metadata; plugin.title = title; - plugin.heading = util.escapeXml(header); - plugin.body = util.escapeXml(msg).replace(/\n/g, "
"); + plugin.heading = options && options.isHTML ? header : util.escapeXml(header); + plugin.body = options && options.isHTML ? header : util.escapeXml(header); plugin.allowClose = cancel; From 01bdbf820783bd7b0769f6ae70fd10121382f4f7 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sun, 13 Sep 2015 06:34:41 +0000 Subject: [PATCH 2/5] Fix trivial error in question --- plugins/c9.ide.dialog.common/question.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.dialog.common/question.js b/plugins/c9.ide.dialog.common/question.js index 7ebd194a..1b05a986 100644 --- a/plugins/c9.ide.dialog.common/question.js +++ b/plugins/c9.ide.dialog.common/question.js @@ -38,7 +38,7 @@ define(function(require, module, exports) { plugin.title = title; plugin.heading = options && options.isHTML ? header : util.escapeXml(header); - plugin.body = options && options.isHTML ? header : util.escapeXml(header); + plugin.body = options && options.isHTML ? msg : util.escapeXml(msg); plugin.allowClose = cancel; From c1e2162db8b0764d7644ac10d7c2fdb36a33d65a Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sun, 13 Sep 2015 06:34:51 +0000 Subject: [PATCH 3/5] Jump to 0:0 if no position is provided Fixes +9345 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbeb8fc0..4ee737a7 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#00dd412ebd", + "c9.ide.language": "#3c703d6784", "c9.ide.language.css": "#a649f2a710", "c9.ide.language.generic": "#77d43cfaf0", "c9.ide.language.html": "#0f4078c187", From 1e1f5b320856b9ea328f8b5ebf8d73872d3407e5 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sun, 13 Sep 2015 06:35:23 +0000 Subject: [PATCH 4/5] Remove warning --- plugins/c9.ide.terminal/predict_echo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.ide.terminal/predict_echo.js b/plugins/c9.ide.terminal/predict_echo.js index 92697099..f634a093 100644 --- a/plugins/c9.ide.terminal/predict_echo.js +++ b/plugins/c9.ide.terminal/predict_echo.js @@ -493,8 +493,8 @@ define(function(require, exports, module) { predictStartY = session.terminal.y + session.terminal.ybase; state = STATE_PREDICT; if (!checkTextBeforePrediction()) { - errorHandler.reportError(new Error("Warning: unable to init predictions")); - if (DEBUG) debugger; + // Appears to happen when tmux or shell unexpectedly sends a new line + console.warn("Unable to init predictions"); state = STATE_WAIT_FOR_ECHO; } }); From 25624cecb2e712f69191d5004b202c9ac4cb532b Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sun, 13 Sep 2015 07:02:26 +0000 Subject: [PATCH 5/5] Restore
--- plugins/c9.ide.dialog.common/question.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.dialog.common/question.js b/plugins/c9.ide.dialog.common/question.js index 1b05a986..4491b1e8 100644 --- a/plugins/c9.ide.dialog.common/question.js +++ b/plugins/c9.ide.dialog.common/question.js @@ -38,7 +38,7 @@ define(function(require, module, exports) { plugin.title = title; plugin.heading = options && options.isHTML ? header : util.escapeXml(header); - plugin.body = options && options.isHTML ? msg : util.escapeXml(msg); + plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "
"); plugin.allowClose = cancel;