From 2a5ad4723dbc74ea96b804adfc1da08c026764b7 Mon Sep 17 00:00:00 2001 From: c9jenkinsv3 Date: Thu, 15 Mar 2018 04:56:54 +0100 Subject: [PATCH] Thu Mar 15 04:56:54 CET 2018 --- build/standalone/config/default.js | 66 ++++++++++++++----- lib/tern/package.json | 2 +- lib/tern_from_ts/package.json | 2 +- node_modules/nak/package.json | 2 +- node_modules/tern/package.json | 2 +- node_modules/tern_from_ts/package.json | 2 +- package.json | 2 +- .../node_modules/vfs-http-adapter/restful.js | 3 +- version | 2 +- 9 files changed, 57 insertions(+), 26 deletions(-) diff --git a/build/standalone/config/default.js b/build/standalone/config/default.js index 5e7039a1..abf8a0fb 100644 --- a/build/standalone/config/default.js +++ b/build/standalone/config/default.js @@ -72611,6 +72611,7 @@ define("plugins/c9.ide.theme.jett/plugin",[], function(require, exports, module) group: "flat", color: "rgb(41, 58, 86)", name: "jett-dark", + caption: "Jett Dark", defaults: { output: { backgroundColor: "#2b303b", @@ -143483,36 +143484,42 @@ define("plugins/c9.ide.ace/themes",[], function(require, exports, module) { layout.addTheme({ group: "classic", - color: "#252525;", + color: "#252525;", name: "dark", + caption: "Classic Dark", }); layout.addTheme({ group: "classic", color: "#3f3f3f;", name: "dark-gray", + caption: "Classic Dark Gray", }); layout.addTheme({ group: "classic", color: "#aaa;", name: "light-gray", hidden: !options.lightClassic, + caption: "Classic Light Gray", }); layout.addTheme({ group: "classic", color: "#dcdbdb;", name: "light", hidden: !options.lightClassic, + caption: "Classic Light", }); layout.addTheme({ group: "flat", color: "#252525;", name: "flat-dark", - hidden: !FLATDARK + hidden: !FLATDARK, + caption: "Flat Dark", }); layout.addTheme({ group: "flat", color: "#dcdbdb;", name: "flat-light", + caption: "Flat Light", }); } @@ -146175,7 +146182,7 @@ define("plugins/c9.ide.ace/ace",[], function(require, exports, module) { var isMinimal = options.minimal; var themeLoaded = {}; var themeCounter = 100; - var lastTheme, grpSyntax, grpThemes; + var lastTheme, grpSyntax, grpThemes, grpUiThemes; var currentTheme; var skin = settings.get("user/general/@skin"); @@ -147246,32 +147253,53 @@ define("plugins/c9.ide.ace/ace",[], function(require, exports, module) { }); grpThemes = new ui.group(); + grpUiThemes = new ui.group(); menus.addItemByPath("View/Themes/", new ui.menu({ "onprop.visible": function(e) { - if (e.value) + if (e.value) { grpThemes.setValue(settings.get("user/ace/@theme")); + grpUiThemes.setValue(settings.get("user/general/@skin")); + } + if (themeMenuShown) + return; + themeMenuShown = true; + menus.addItemByPath("View/Themes/Ui Themes/", null, 0, handle); + menus.addItemByPath("View/Themes/~", new ui.divider(), themeCounter += 100, handle); + layout.listThemes().forEach(function(theme) { + menus.addItemByPath("View/Themes/Ui Themes/" + theme.caption, new ui.item({ + type: "radio", + value: theme.name, + group: grpUiThemes, + onclick: function(e) { + var themeName = e.currentTarget.value; + settings.set("user/general/@skin", themeName); + } + }), 0, handle); + }); + + for (var name in themes) { + if (themes[name] instanceof Array) { + menus.addItemByPath("View/Themes/" + name + "/", null, themeCounter++, handle); + + themes[name].forEach(function (n) { + var themeprop = Object.keys(n)[0]; + addThemeMenu(name + "/" + themeprop, n[themeprop], -1); + }); + } + else { + addThemeMenu(name, null, themeCounter++); + } + } } }), 350000, handle); - for (var name in themes) { - if (themes[name] instanceof Array) { - menus.addItemByPath("View/Themes/" + name + "/", null, themeCounter++, handle); - - themes[name].forEach(function (n) { - var themeprop = Object.keys(n)[0]; - addThemeMenu(name + "/" + themeprop, n[themeprop], -1); - }); - } - else { - addThemeMenu(name, null, themeCounter++); - } - } grpSyntax = new ui.group(); - handle.addElement(grpNewline, grpSyntax, grpThemes); + handle.addElement(grpNewline, grpSyntax, grpThemes, grpUiThemes); } var preview; + var themeMenuShown; var setMenuThemeDelayed = lang.delayedCall(function() { setMenuTheme(preview, true); }, 150); @@ -147279,6 +147307,8 @@ define("plugins/c9.ide.ace/ace",[], function(require, exports, module) { setTheme(path || settings.get("user/ace/@theme"), isPreview); } function addThemeMenu(name, path, index, plugin) { + if (!themeMenuShown) + return; menus.addItemByPath("View/Themes/" + name, new ui.item({ type: "radio", value: path || themes[name], diff --git a/lib/tern/package.json b/lib/tern/package.json index fb2c5b1f..c7bd786e 100644 --- a/lib/tern/package.json +++ b/lib/tern/package.json @@ -248,7 +248,7 @@ }, "homepage": "https://github.com/ternjs/tern#readme", "_id": "tern@0.16.1", - "_shasum": "e899f56ba505124cce3310ceb8414d5f1583ab38", + "_shasum": "398011f3237ae494911e5ea433afa99f29d8438e", "_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e", "_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e" } diff --git a/lib/tern_from_ts/package.json b/lib/tern_from_ts/package.json index d79b6ffe..213e01de 100644 --- a/lib/tern_from_ts/package.json +++ b/lib/tern_from_ts/package.json @@ -20,7 +20,7 @@ "readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n", "readmeFilename": "README.md", "_id": "tern_from_ts@0.0.1", - "_shasum": "1fed17d49d8aecdfbd1bfe4a05256105910b00b2", + "_shasum": "84d85855bf0661125b9b5ba9ed52ce15b60b2a2b", "_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c", "_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c" } diff --git a/node_modules/nak/package.json b/node_modules/nak/package.json index e55c6ffe..38a157c9 100644 --- a/node_modules/nak/package.json +++ b/node_modules/nak/package.json @@ -52,7 +52,7 @@ }, "homepage": "https://github.com/gjtorikian/nak#readme", "_id": "nak@0.3.3", - "_shasum": "7c9ec82f0c5985b45ce6ba3947351651105ce8d8", + "_shasum": "6b8d08706fc0d86166bc5331e7b72e060368012c", "_from": "git+https://github.com/cloud9ide/nak.git#6deef931594", "_resolved": "git+https://github.com/cloud9ide/nak.git#6deef931594787edd167040f7352e3e7533430e4" } diff --git a/node_modules/tern/package.json b/node_modules/tern/package.json index fb2c5b1f..c7bd786e 100644 --- a/node_modules/tern/package.json +++ b/node_modules/tern/package.json @@ -248,7 +248,7 @@ }, "homepage": "https://github.com/ternjs/tern#readme", "_id": "tern@0.16.1", - "_shasum": "e899f56ba505124cce3310ceb8414d5f1583ab38", + "_shasum": "398011f3237ae494911e5ea433afa99f29d8438e", "_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e", "_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e" } diff --git a/node_modules/tern_from_ts/package.json b/node_modules/tern_from_ts/package.json index d79b6ffe..213e01de 100644 --- a/node_modules/tern_from_ts/package.json +++ b/node_modules/tern_from_ts/package.json @@ -20,7 +20,7 @@ "readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n", "readmeFilename": "README.md", "_id": "tern_from_ts@0.0.1", - "_shasum": "1fed17d49d8aecdfbd1bfe4a05256105910b00b2", + "_shasum": "84d85855bf0661125b9b5ba9ed52ce15b60b2a2b", "_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c", "_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c" } diff --git a/package.json b/package.json index 999b65f9..3bf1844a 100644 --- a/package.json +++ b/package.json @@ -49,5 +49,5 @@ }, "devDependencies": {}, "licenses": [], - "revision": "59eb6c51d6f72522362c3e540101f976851fb883" + "revision": "4324d55aa4dae21857071081fc9e2463cdedbbb9" } diff --git a/plugins/node_modules/vfs-http-adapter/restful.js b/plugins/node_modules/vfs-http-adapter/restful.js index ca4c8568..c858a501 100644 --- a/plugins/node_modules/vfs-http-adapter/restful.js +++ b/plugins/node_modules/vfs-http-adapter/restful.js @@ -315,7 +315,7 @@ module.exports = function setup(mount, vfs, mountOptions) { command = vfs.symlink; options.target = message.linkTo; } - else if (message.metadata){ + else if (message.metadata) { command = vfs.metadata; options.metadata = message.metadata; } @@ -324,6 +324,7 @@ module.exports = function setup(mount, vfs, mountOptions) { } command(path, options, function (err, meta) { if (err) return abort(err); + res.setHeader("Content-Type", "text/plain"); res.end(); }); }); diff --git a/version b/version index bde66720..d35b977a 100644 --- a/version +++ b/version @@ -1 +1 @@ -1520999796 +1521086209