Merge pull request +11765 from c9/fix/various

Fix several small issues
This commit is contained in:
Harutyun Amirjanyan 2016-01-22 17:24:36 +04:00
commit 655b2053c6
4 changed files with 9 additions and 8 deletions

View File

@ -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) {

View File

@ -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;

View File

@ -67,7 +67,7 @@
"c9.ide.language.javascript.tern": "#45e5f5b0e5",
"c9.ide.language.javascript.infer": "#8b9cf15328",
"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",
@ -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",
@ -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",

View File

@ -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>&#169; 2010 — 2015 Cloud9 Inc. All rights reserved</p>
<p>&#169; 2010 — 2016 Cloud9 Inc. All rights reserved</p>
</div>
</div>
</a:window>