kopia lustrzana https://github.com/c9/core
Merge remote-tracking branch 'origin/master' into monitor-workspaces
commit
e4314c97d2
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"app": {
|
||||
"launch": {
|
||||
"web_url": "http://c9.io/"
|
||||
"web_url": "http://c9.io/#1page"
|
||||
},
|
||||
"urls": [
|
||||
"https://c9.io/", "https://www.c9.io/", "https://ide.c9.io/",
|
||||
|
|
|
@ -321,7 +321,82 @@ module.exports = function(options) {
|
|||
"plugins/c9.ide.language.javascript/javascript",
|
||||
"plugins/c9.ide.language.javascript.immediate/immediate",
|
||||
"plugins/c9.ide.language.javascript.infer/jsinfer",
|
||||
"plugins/c9.ide.language.javascript.tern/tern",
|
||||
{
|
||||
packagePath: "plugins/c9.ide.language.javascript.tern/tern",
|
||||
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,
|
||||
experimental: false,
|
||||
firstClass: true,
|
||||
path: "lib/tern/defs/ecma5.json"
|
||||
}, {
|
||||
name: "jQuery",
|
||||
enabled: true,
|
||||
experimental: false,
|
||||
path: "lib/tern/defs/jquery.json"
|
||||
}, {
|
||||
name: "browser",
|
||||
enabled: true,
|
||||
experimental: false,
|
||||
firstClass: true,
|
||||
path: "lib/tern/defs/browser.json"
|
||||
}, {
|
||||
name: "underscore",
|
||||
enabled: false,
|
||||
experimental: false,
|
||||
path: "lib/tern/defs/underscore.json"
|
||||
}, {
|
||||
name: "chai",
|
||||
enabled: false,
|
||||
experimental: false,
|
||||
path: "lib/tern/defs/chai.json"
|
||||
}]
|
||||
},
|
||||
"plugins/c9.ide.language.javascript.tern/ui",
|
||||
"plugins/c9.ide.language.javascript.tern/architect_resolver",
|
||||
"plugins/c9.ide.language.javascript.eslint/eslint",
|
||||
{
|
||||
|
|
|
@ -172,7 +172,8 @@ function DefaultHandlers(mouseHandler) {
|
|||
};
|
||||
|
||||
this.onMouseUp = function(ev) {
|
||||
if (this.isMousePressed) return;
|
||||
if (this.isMousePressed == 2) return; // wait until release capture
|
||||
this.isMousePressed = false;
|
||||
var pos = ev.getDocumentPosition();
|
||||
var node = this.editor.provider.findItemAtOffset(pos.y);
|
||||
if (node && this.$clickNode && this.$clickNode == node) {
|
||||
|
|
|
@ -87,7 +87,7 @@ var MouseHandler = function(editor) {
|
|||
this.x = ev.x;
|
||||
this.y = ev.y;
|
||||
|
||||
this.isMousePressed = true;
|
||||
this.isMousePressed = 2;
|
||||
|
||||
// do not move textarea during selection
|
||||
var renderer = this.editor.renderer;
|
||||
|
|
36
package.json
36
package.json
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "c9",
|
||||
"description": "New Cloud9 Client",
|
||||
"version": "3.1.1129",
|
||||
"version": "3.1.1160",
|
||||
"author": "Ajax.org B.V. <info@ajax.org>",
|
||||
"private": true,
|
||||
"main": "bin/c9",
|
||||
|
@ -34,8 +34,8 @@
|
|||
"rusha": "~0.7.2",
|
||||
"send": "~0.1.4",
|
||||
"simple-mime": "~0.0.8",
|
||||
"tern": "git://github.com/cloud9ide/tern.git#749e64a0f0fed91f883ff055df37b4bfc9f2d980",
|
||||
"tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#6a0107e602b0d044fe1753533cf31f52cf5fb95a",
|
||||
"tern": "git://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",
|
||||
"tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#84d51dcb9b16b126a206789d4d4237cde2801fe4",
|
||||
"through": "2.2.0",
|
||||
"tmp": "~0.0.20",
|
||||
"uglify-js": "2.4.16",
|
||||
|
@ -56,23 +56,23 @@
|
|||
"c9"
|
||||
],
|
||||
"c9plugins": {
|
||||
"c9.ide.language": "#c1cdf70cf0",
|
||||
"c9.ide.language": "#8e73db4417",
|
||||
"c9.ide.language.css": "#be07d72209",
|
||||
"c9.ide.language.generic": "#7a1150bc50",
|
||||
"c9.ide.language.generic": "#9d6f268f8d",
|
||||
"c9.ide.language.html": "#9be847c0ce",
|
||||
"c9.ide.language.html.diff": "#24f3608d26",
|
||||
"c9.ide.language.javascript": "#1a0b1584c2",
|
||||
"c9.ide.language.javascript.immediate": "#c8b1e5767a",
|
||||
"c9.ide.language.javascript.eslint": "#3127e1eba1",
|
||||
"c9.ide.language.javascript.tern": "#f9ba3813d7",
|
||||
"c9.ide.language.javascript.infer": "#c88fc6e405",
|
||||
"c9.ide.language.javascript.tern": "#45e5f5b0e5",
|
||||
"c9.ide.language.javascript.infer": "#8664d42920",
|
||||
"c9.ide.language.jsonalyzer": "#47a64de05d",
|
||||
"c9.ide.collab": "#10c224f9b8",
|
||||
"c9.ide.collab": "#e2411fc12b",
|
||||
"c9.ide.local": "#a6e689e33b",
|
||||
"c9.ide.find": "#e33fbaed2f",
|
||||
"c9.ide.find.infiles": "#c3bf17286d",
|
||||
"c9.ide.find.replace": "#8cbce45290",
|
||||
"c9.ide.run.debug": "#8b77a8379d",
|
||||
"c9.ide.run.debug": "#7dfe32f721",
|
||||
"c9.automate": "#47e2c429c9",
|
||||
"c9.ide.ace.emmet": "#6dc4585e02",
|
||||
"c9.ide.ace.gotoline": "#a8ff07c8f4",
|
||||
|
@ -83,7 +83,7 @@
|
|||
"c9.ide.ace.stripws": "#cf0f42ac59",
|
||||
"c9.ide.behaviors": "#db32109ebc",
|
||||
"c9.ide.closeconfirmation": "#cee4674141",
|
||||
"c9.ide.configuration": "#a9066299a2",
|
||||
"c9.ide.configuration": "#e3c90dcd96",
|
||||
"c9.ide.dialog.wizard": "#7667ec79a8",
|
||||
"c9.ide.fontawesome": "#781602c5d8",
|
||||
"c9.ide.format": "#5ec97fb083",
|
||||
|
@ -91,12 +91,12 @@
|
|||
"c9.ide.imgeditor": "#612e75ef4f",
|
||||
"c9.ide.immediate": "#a962119bec",
|
||||
"c9.ide.installer": "#0fde9f0067",
|
||||
"c9.ide.language.python": "#e30d1a9a50",
|
||||
"c9.ide.language.python": "#a4ded9bab0",
|
||||
"c9.ide.language.go": "#a023f576ae",
|
||||
"c9.ide.mount": "#befb8188d5",
|
||||
"c9.ide.navigate": "#38ae100ea1",
|
||||
"c9.ide.navigate": "#1fbb7cd53b",
|
||||
"c9.ide.newresource": "#981a408a7b",
|
||||
"c9.ide.openfiles": "#358ac94915",
|
||||
"c9.ide.openfiles": "#2ae85a9e33",
|
||||
"c9.ide.preview": "#8f87ff2f6a",
|
||||
"c9.ide.preview.browser": "#c5b9a129de",
|
||||
"c9.ide.preview.markdown": "#bc846e1562",
|
||||
|
@ -105,15 +105,15 @@
|
|||
"c9.ide.recentfiles": "#7c099abf40",
|
||||
"c9.ide.remote": "#301d2ab519",
|
||||
"c9.ide.processlist": "#2b12cd1bdd",
|
||||
"c9.ide.run": "#453aa5f604",
|
||||
"c9.ide.run": "#f03e4b018e",
|
||||
"c9.ide.run.build": "#0598fff697",
|
||||
"c9.ide.run.debug.xdebug": "#5553240abe",
|
||||
"c9.ide.run.debug.xdebug": "#a1b39e0ac4",
|
||||
"c9.ide.save": "#9461acd953",
|
||||
"c9.ide.scm": "#930a9e6f00",
|
||||
"c9.ide.scm": "#ca3c94b84f",
|
||||
"c9.ide.terminal.monitor": "#a0d1f02991",
|
||||
"c9.ide.test": "#8f21f662d3",
|
||||
"c9.ide.test": "#a282ec1619",
|
||||
"c9.ide.test.mocha": "#fc053b23d2",
|
||||
"c9.ide.theme.flat": "#92cda0fb40",
|
||||
"c9.ide.theme.flat": "#81dadeee55",
|
||||
"c9.ide.threewaymerge": "#229382aa0b",
|
||||
"c9.ide.undo": "#b028bcb4d5",
|
||||
"c9.ide.upload": "#0bd010d3dc",
|
||||
|
|
|
@ -21,13 +21,13 @@
|
|||
</div>
|
||||
<div class="c9Staff">
|
||||
<p textselect="true">
|
||||
Arron Bailiss, Bas de Wachter, Dana Ivan, Fabian Jakobs, Harutyun Amirjanyan,
|
||||
Ivar Pruijn, Justin Dray, Lennart Kats, Luca Cipriani,
|
||||
Alex Brausewetter, Arron Bailiss, Bas de Wachter, Dana Ivan,
|
||||
Fabian Jakobs, Harutyun Amirjanyan, Ivar Pruijn, Justin Dray, Lennart Kats, Luca Cipriani,
|
||||
Mostafa Eweda, Matthijs van Henten, Nikolai Onken, Suraj Biyani, Tim Robinson, Ruben Daniels
|
||||
</p>
|
||||
</div>
|
||||
<div class="c9Copyright">
|
||||
<p>© 2010 — 2015 Cloud9 Inc. All rights reserved</p>
|
||||
<p>© 2010 — 2016 Cloud9 Inc. All rights reserved</p>
|
||||
</div>
|
||||
</div>
|
||||
</a:window>
|
||||
|
|
|
@ -26,6 +26,7 @@ define(function(require, exports, module) {
|
|||
var plugin = new Panel("Ajax.org", main.consumes, {
|
||||
index: options.index || 300,
|
||||
caption: "Commands",
|
||||
buttonCSSClass: "commands",
|
||||
minWidth: 150,
|
||||
autohide: true,
|
||||
where: options.where || "left"
|
||||
|
|
|
@ -798,7 +798,7 @@
|
|||
@gutter-tooltip-dark-shadow: 1px 1px 6px darken(rgba(0, 0, 0, 0.8), @darken-chrome);
|
||||
@gutter-tooltip-dark-background: darken(#FFF399, @darken-chrome);
|
||||
@gutter-tooltip-dark-border: black;
|
||||
@gutter-tooltip-dark-color: darken(#e0e3e8, @darken-chrome);
|
||||
@gutter-tooltip-dark-color: darken(#333, @darken-chrome);
|
||||
@gutter-tooltip-dark-font-smoothing: true;
|
||||
|
||||
// Splitter
|
||||
|
|
|
@ -55,8 +55,6 @@ define(function(require, exports, module) {
|
|||
|
||||
/***** Methods *****/
|
||||
|
||||
// =0 means the value should be set to 0 to disable otherwise it is enabled
|
||||
// =1 means the value should be set to 1 to enable otherwise it is disabled
|
||||
var found = {};
|
||||
function addExperiment(name, defaultValue, caption){
|
||||
var uniqueId = name.replace(/\//g, "-");
|
||||
|
@ -105,6 +103,7 @@ define(function(require, exports, module) {
|
|||
plugin.on("unload", function() {
|
||||
loaded = false;
|
||||
drawn = false;
|
||||
hasAlerted = false;
|
||||
intro = null;
|
||||
});
|
||||
|
||||
|
|
|
@ -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",
|
||||
];
|
||||
|
|
|
@ -46,6 +46,7 @@ define(function(require, exports, module) {
|
|||
index: options.index || 100,
|
||||
caption: "Workspace",
|
||||
panelCSSClass: "workspace_files",
|
||||
buttonCSSClass: "workspace",
|
||||
minWidth: 130,
|
||||
where: options.where || "left"
|
||||
});
|
||||
|
|
|
@ -331,7 +331,7 @@ function plugin(options, imports, register) {
|
|||
.end(function() {});
|
||||
|
||||
user.lastVfsAccess = Date.now();
|
||||
user.save(function() {});
|
||||
user.save && user.save(function() {});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -110,8 +110,9 @@ updateCore() {
|
|||
fi
|
||||
|
||||
# without this git merge fails on windows
|
||||
mv ./scripts/install-sdk.sh ./scripts/.install-sdk-tmp.sh
|
||||
cp ./scripts/.install-sdk-tmp.sh ./scripts/install-sdk.sh
|
||||
mv ./scripts/install-sdk.sh './scripts/.#install-sdk-tmp.sh'
|
||||
rm ./scripts/.install-sdk-tmp.sh
|
||||
cp './scripts/.#install-sdk-tmp.sh' ./scripts/install-sdk.sh
|
||||
git checkout -- ./scripts/install-sdk.sh
|
||||
|
||||
git remote add c9 https://github.com/c9/core 2> /dev/null || true
|
||||
|
|
|
@ -46,7 +46,7 @@ shortcuts.localdev = shortcuts.onlinedev.concat([
|
|||
shortcuts.odev = shortcuts.onlinedev; // For backwards compatibility, if you see this in 2016 remove this line
|
||||
var delayLoadConfigs = [
|
||||
// Services that are usually not immediately needed
|
||||
"preview", "user-content", "api", "apps-proxy", "worker",
|
||||
"preview", "user-content", "apps-proxy", "worker", "homepage",
|
||||
// Services that are very slow to load, blocking others
|
||||
"profile",
|
||||
];
|
||||
|
|
Ładowanie…
Reference in New Issue