Merge branch 'master' of https://github.com/ajaxorg/ace
Conflicts: lib/ace/scrollbar.js lib/ace/virtual_renderer.js
This commit is contained in:
commit
1e01007990
6 changed files with 10 additions and 9 deletions
|
|
@ -64,7 +64,7 @@ var Editor =function(renderer, doc) {
|
|||
return event.preventDefault(e);
|
||||
});
|
||||
|
||||
var mouseTarget = renderer.getMouseEventTarget();
|
||||
var mouseTarget = renderer.getMouseEventTarget();
|
||||
event.addListener(mouseTarget, "mousedown", lang.bind(this.onMouseDown, this));
|
||||
event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, lang.bind(this.onMouseDoubleClick, this));
|
||||
event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, lang.bind(this.onMouseTripleClick, this));
|
||||
|
|
@ -454,7 +454,7 @@ var Editor =function(renderer, doc) {
|
|||
indent += 1;
|
||||
else
|
||||
break;
|
||||
if (/[^\s]$/.test(line))
|
||||
if (/[^\s]/.test(line))
|
||||
minIndent = Math.min(indent, minIndent);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue