From 2c21409a4abbdc16f0ce4e6d202d1079e3e357b8 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sat, 12 Dec 2015 10:05:51 +0000 Subject: [PATCH] Refactor settings handling --- configs/client-default.js | 53 +++++++++++++++---- package.json | 2 +- .../c9.ide.server/views/flat-load-screen.html | 2 +- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index 91f7bd81..509d27ac 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -323,15 +323,50 @@ module.exports = function(options) { "plugins/c9.ide.language.javascript.infer/jsinfer", { packagePath: "plugins/c9.ide.language.javascript.tern/tern", - plugins: { - angular: "tern/plugin/angular", - doc_comment: "tern/plugin/doc_comment", - es_modules: "tern/plugin/es_modules", - modules: "tern/plugin/modules", - node: "tern/plugin/node", - requirejs: "tern/plugin/requirejs", - architect_resolver: "./architect_resolver_worker", - }, + plugins: [ + { + name: "angular", + path: "tern/plugin/angular", + enabled: true, + hidden: false, + }, + { + name: "doc_comment", + path: "tern/plugin/doc_comment", + enabled: true, + hidden: true, + }, + { + name: "es_modules", + path: "tern/plugin/es_modules", + enabled: true, + hidden: true, + }, + { + name: "modules", + path: "tern/plugin/modules", + enabled: true, + hidden: true, + }, + { + name: "node", + path: "tern/plugin/node", + enabled: true, + hidden: false, + }, + { + name: "requirejs", + path: "tern/plugin/requirejs", + enabled: true, + hidden: false, + }, + { + name: "architect_resolver", + path: "./architect_resolver_worker", + enabled: true, + hidden: true, + }, + ], defs: [{ name: "ecma5", enabled: true, diff --git a/package.json b/package.json index 24ef812f..bfb9a92d 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "c9.ide.language.javascript": "#2b77bdb96a", "c9.ide.language.javascript.immediate": "#0535804ada", "c9.ide.language.javascript.eslint": "#3ec4557969", - "c9.ide.language.javascript.tern": "#070988902f", + "c9.ide.language.javascript.tern": "#5d8d03491f", "c9.ide.language.javascript.infer": "#b15bdb1744", "c9.ide.language.jsonalyzer": "#45453961d9", "c9.ide.collab": "#30efed939e", diff --git a/plugins/c9.ide.server/views/flat-load-screen.html b/plugins/c9.ide.server/views/flat-load-screen.html index 533499e4..f59a85e1 100644 --- a/plugins/c9.ide.server/views/flat-load-screen.html +++ b/plugins/c9.ide.server/views/flat-load-screen.html @@ -34,7 +34,7 @@ "Stop cursing, start coding", "GET /this/workspace#loaded", "Use our Vim mode for extra addictive effect!", - "Not your grandfather's IDE", + "Not your grandmother's IDE", "Now made with 20% more cloud!", "Literally makes your laptop cooler", ];