From 4e98f9e1154208b5bfffeab5ce2abce32f3854d5 Mon Sep 17 00:00:00 2001 From: Mutahhir Date: Thu, 18 Feb 2016 11:23:51 +0000 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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",