From 8652d45ce3c469cc0528d4e7df4815a37517243e Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Fri, 4 Sep 2015 14:44:40 +0000 Subject: [PATCH 01/12] Improve dialog input handling --- plugins/c9.ide.dialog.common/alert_internal.js | 2 +- plugins/c9.ide.dialog.common/confirm.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/c9.ide.dialog.common/alert_internal.js b/plugins/c9.ide.dialog.common/alert_internal.js index c76edc94..572c48ad 100644 --- a/plugins/c9.ide.dialog.common/alert_internal.js +++ b/plugins/c9.ide.dialog.common/alert_internal.js @@ -37,7 +37,7 @@ define(function(require, module, exports) { else { plugin.title = title; } - plugin.heading = util.escapeXml(header); + plugin.heading = options && options.isHTML ? header : util.escapeXml(header); plugin.body = options && options.isHTML ? msg : (util.escapeXml(msg) || "") .replace(/\n/g, "
") .replace(/(https?:\/\/[^\s]*\b)/g, "$1"); diff --git a/plugins/c9.ide.dialog.common/confirm.js b/plugins/c9.ide.dialog.common/confirm.js index dd841a01..640d2f78 100644 --- a/plugins/c9.ide.dialog.common/confirm.js +++ b/plugins/c9.ide.dialog.common/confirm.js @@ -25,7 +25,7 @@ define(function(require, module, exports) { return plugin.queue(function(){ plugin.title = title; plugin.heading = util.escapeXml(header); - plugin.body = util.escapeXml(msg); + plugin.body = util.escapeXml(msg).replace("\n", "
"); plugin.update([ { id: "ok", onclick: function(){ plugin.hide(); onconfirm(); } }, From 5f905c9f702dfefd6e07c6b8faee6305b11ce1ff Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Fri, 4 Sep 2015 14:44:52 +0000 Subject: [PATCH 02/12] Add isMaster() when ?collab=0 is used --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8e529fce..986a1505 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "c9.ide.language.javascript.eslint": "#df7e424b54", "c9.ide.language.javascript.tern": "#ad1d9b1b3a", "c9.ide.language.javascript.infer": "#8478e3c702", - "c9.ide.language.jsonalyzer": "#875571f514", + "c9.ide.language.jsonalyzer": "#10c64851e0", "c9.ide.collab": "#fa6d77524f", "c9.ide.local": "#a9703b630c", "c9.ide.find": "#e073bf251a", From 3021c7d7d66c1fd4341b905f3622536b2fda67b7 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Fri, 4 Sep 2015 14:49:05 +0000 Subject: [PATCH 03/12] Make property instead --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 986a1505..d10cfce8 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "c9.ide.language.javascript.eslint": "#df7e424b54", "c9.ide.language.javascript.tern": "#ad1d9b1b3a", "c9.ide.language.javascript.infer": "#8478e3c702", - "c9.ide.language.jsonalyzer": "#10c64851e0", + "c9.ide.language.jsonalyzer": "#3ba9392a0a", "c9.ide.collab": "#fa6d77524f", "c9.ide.local": "#a9703b630c", "c9.ide.find": "#e073bf251a", From 837ac1c9426d9b6fd71004420cefd8caef356c93 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sat, 5 Sep 2015 10:09:46 +0000 Subject: [PATCH 04/12] Add methods to control saving caption UI --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d10cfce8..8394dda3 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "c9.ide.run": "#6c32e5de36", "c9.ide.run.build": "#ad45874c88", "c9.ide.run.debug.xdebug": "#61dcbd0180", - "c9.ide.save": "#cc613b6ead", + "c9.ide.save": "#52fbccc5e3", "c9.ide.scm": "#f3847917b8", "c9.ide.terminal.monitor": "#b52a3f2144", "c9.ide.theme.flat": "#2de8414db7", From 0f0b4e15fb56356e5e7dd5837385c618f75a6f0b Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sun, 6 Sep 2015 14:58:36 +0000 Subject: [PATCH 05/12] Show caption when setting value --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8394dda3..0d0c6da1 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "c9.ide.run": "#6c32e5de36", "c9.ide.run.build": "#ad45874c88", "c9.ide.run.debug.xdebug": "#61dcbd0180", - "c9.ide.save": "#52fbccc5e3", + "c9.ide.save": "#4096c48375", "c9.ide.scm": "#f3847917b8", "c9.ide.terminal.monitor": "#b52a3f2144", "c9.ide.theme.flat": "#2de8414db7", From f8dce6bcda349db5d8db3a7721a3929b24fcf301 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sun, 6 Sep 2015 15:01:20 +0000 Subject: [PATCH 06/12] Remove console.log --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d0c6da1..46def112 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#ad1d9b1b3a", "c9.ide.language.javascript.infer": "#8478e3c702", "c9.ide.language.jsonalyzer": "#3ba9392a0a", - "c9.ide.collab": "#fa6d77524f", + "c9.ide.collab": "#d22bcaaa49", "c9.ide.local": "#a9703b630c", "c9.ide.find": "#e073bf251a", "c9.ide.find.infiles": "#c132ad243c", From d63ba4c81abe444a17f323390d2342649c971759 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sun, 6 Sep 2015 16:39:18 +0000 Subject: [PATCH 07/12] Fix reserved key --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 46def112..bd22b8c3 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "c9.ide.installer": "#be8d9aa07c", "c9.ide.mount": "#292b312b4b", "c9.ide.navigate": "#6e4efa5b25", - "c9.ide.newresource": "#f1f0624768", + "c9.ide.newresource": "#981a408a7b", "c9.ide.openfiles": "#28a4f5af16", "c9.ide.preview": "#a75e218d3e", "c9.ide.preview.browser": "#c50007ebbc", From f63fb2f5b2f98af5deead2f0d49f09afbdc804b4 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sun, 6 Sep 2015 19:28:28 +0000 Subject: [PATCH 08/12] Treat caption as undefined when invisible --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd22b8c3..e3985661 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "c9.ide.run": "#6c32e5de36", "c9.ide.run.build": "#ad45874c88", "c9.ide.run.debug.xdebug": "#61dcbd0180", - "c9.ide.save": "#4096c48375", + "c9.ide.save": "#a0ad1c04e6", "c9.ide.scm": "#f3847917b8", "c9.ide.terminal.monitor": "#b52a3f2144", "c9.ide.theme.flat": "#2de8414db7", From 79f44e5529a9b0b4a828bb7664a15908ffc5998d Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sun, 6 Sep 2015 19:44:07 +0000 Subject: [PATCH 09/12] Cleanup error message --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3985661..9c92f235 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "c9.ide.language.javascript.eslint": "#df7e424b54", "c9.ide.language.javascript.tern": "#ad1d9b1b3a", "c9.ide.language.javascript.infer": "#8478e3c702", - "c9.ide.language.jsonalyzer": "#3ba9392a0a", + "c9.ide.language.jsonalyzer": "#83646961c7", "c9.ide.collab": "#d22bcaaa49", "c9.ide.local": "#a9703b630c", "c9.ide.find": "#e073bf251a", From d9d784b6d595573d9bcb835d104aa6ea93e82fe8 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Mon, 7 Sep 2015 11:13:13 +0000 Subject: [PATCH 10/12] Fix documentation --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c92f235..38acb1e0 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "c9.ide.run": "#6c32e5de36", "c9.ide.run.build": "#ad45874c88", "c9.ide.run.debug.xdebug": "#61dcbd0180", - "c9.ide.save": "#a0ad1c04e6", + "c9.ide.save": "#4ce769ac0e", "c9.ide.scm": "#f3847917b8", "c9.ide.terminal.monitor": "#b52a3f2144", "c9.ide.theme.flat": "#2de8414db7", From 8245b782b8ff4c90d659273a9e5d8ebc87b12073 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Mon, 7 Sep 2015 13:37:42 +0000 Subject: [PATCH 11/12] Allow isHTML for confirm --- plugins/c9.ide.dialog.common/confirm.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/c9.ide.dialog.common/confirm.js b/plugins/c9.ide.dialog.common/confirm.js index 640d2f78..14039f53 100644 --- a/plugins/c9.ide.dialog.common/confirm.js +++ b/plugins/c9.ide.dialog.common/confirm.js @@ -21,11 +21,11 @@ define(function(require, module, exports) { /***** Methods *****/ - function show(title, header, msg, onconfirm, oncancel) { + function show(title, header, msg, onconfirm, oncancel, options) { return plugin.queue(function(){ plugin.title = title; - plugin.heading = util.escapeXml(header); - plugin.body = util.escapeXml(msg).replace("\n", "
"); + plugin.heading = options && options.isHTML ? header : util.escapeXml(header); + plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace("\n", "
"); plugin.update([ { id: "ok", onclick: function(){ plugin.hide(); onconfirm(); } }, From 2c7a029ad13bde2f0336225c0450b5c88eb7083f Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Mon, 7 Sep 2015 14:06:53 +0000 Subject: [PATCH 12/12] Fix replace --- plugins/c9.ide.dialog.common/confirm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.dialog.common/confirm.js b/plugins/c9.ide.dialog.common/confirm.js index 14039f53..6c248a64 100644 --- a/plugins/c9.ide.dialog.common/confirm.js +++ b/plugins/c9.ide.dialog.common/confirm.js @@ -25,7 +25,7 @@ define(function(require, module, exports) { return plugin.queue(function(){ plugin.title = title; plugin.heading = options && options.isHTML ? header : util.escapeXml(header); - plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace("\n", "
"); + plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "
"); plugin.update([ { id: "ok", onclick: function(){ plugin.hide(); onconfirm(); } },