From 199be232be18bb9376e14fc4209bf1a9f4168263 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 20 Jan 2016 20:21:28 +0000 Subject: [PATCH 1/5] fix title of openfiles tree --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d665c173..9e6beaa2 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "c9.ide.mount": "#86c8985f34", "c9.ide.navigate": "#38ae100ea1", "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", From fe4429152ca2c5863456190b1c1862ce8d17d2dd Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 20 Jan 2016 20:34:30 +0000 Subject: [PATCH 2/5] fix menubar issue when switching between flat themes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e6beaa2..e3da3ed5 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "c9.ide.terminal.monitor": "#a0d1f02991", "c9.ide.test": "#8f21f662d3", "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", From f6f5dae0e61e9efe42701b2a5559ffbb217058d5 Mon Sep 17 00:00:00 2001 From: nightwing Date: Thu, 21 Jan 2016 17:37:51 +0000 Subject: [PATCH 3/5] fix error message when accepting collab request --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3da3ed5..8c69c532 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "c9.ide.language.javascript.tern": "#17fb66bef8", "c9.ide.language.javascript.infer": "#c88fc6e405", "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", From 987002b9ca59f679b3932e3634bdc216a48ab334 Mon Sep 17 00:00:00 2001 From: Alex Brausewetter Date: Fri, 22 Jan 2016 06:49:00 +0000 Subject: [PATCH 4/5] update about dialog --- plugins/c9.ide.help/help.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/c9.ide.help/help.xml b/plugins/c9.ide.help/help.xml index f4cd6c88..0050847e 100644 --- a/plugins/c9.ide.help/help.xml +++ b/plugins/c9.ide.help/help.xml @@ -21,13 +21,13 @@

- 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

-

© 2010 — 2015 Cloud9 Inc. All rights reserved

+

© 2010 — 2016 Cloud9 Inc. All rights reserved

From 9cde7eb0f2185a7ed9b35aaeffe0b08129fee8dc Mon Sep 17 00:00:00 2001 From: nightwing Date: Fri, 22 Jan 2016 16:24:04 +0400 Subject: [PATCH 5/5] fix +11728 Preview on tree selection reopens randomly --- node_modules/ace_tree/lib/ace_tree/mouse/default_handlers.js | 3 ++- node_modules/ace_tree/lib/ace_tree/mouse/mouse_handler.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/node_modules/ace_tree/lib/ace_tree/mouse/default_handlers.js b/node_modules/ace_tree/lib/ace_tree/mouse/default_handlers.js index 83fbcd47..b568a458 100644 --- a/node_modules/ace_tree/lib/ace_tree/mouse/default_handlers.js +++ b/node_modules/ace_tree/lib/ace_tree/mouse/default_handlers.js @@ -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) { diff --git a/node_modules/ace_tree/lib/ace_tree/mouse/mouse_handler.js b/node_modules/ace_tree/lib/ace_tree/mouse/mouse_handler.js index 77cf4235..acaf0b49 100644 --- a/node_modules/ace_tree/lib/ace_tree/mouse/mouse_handler.js +++ b/node_modules/ace_tree/lib/ace_tree/mouse/mouse_handler.js @@ -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;