jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix tests

Browse source
This commit is contained in:
nightwing 2013-08-26 22:41:29 +04:00
commit e2b2f08c24
3 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/edit_session/folding.js
View file

@ -273,7 +273,7 @@ function Folding() {
// --- Some checking --- // --- Some checking ---
if (!(startRow < endRow || if (!(startRow < endRow ||
startRow == endRow && startColumn < endColumn - 2)) startRow == endRow && startColumn <= endColumn - 2))
throw "The range has to be at least 2 characters width"; throw "The range has to be at least 2 characters width";
var startFold = this.getFoldAt(startRow, startColumn, 1); var startFold = this.getFoldAt(startRow, startColumn, 1);

18
lib/ace/mode/_test/tokens_batchfile.json
View file

@ -14,16 +14,12 @@
["text"," "], ["text"," "],
["keyword.command.dosbatch","set"], ["keyword.command.dosbatch","set"],
["text"," var1="], ["text"," var1="],
["markup.list","%"], ["constant.numeric","%cd%"]
["constant.other","cd"],
["markup.list","%"]
],[ ],[
"start", "start",
["keyword.command.dosbatch","echo"], ["keyword.command.dosbatch","echo"],
["text"," unhide everything in "], ["text"," unhide everything in "],
["markup.list","%"], ["constant.numeric","%var1%"],
["constant.other","var1"],
["markup.list","%"],
["text","!"] ["text","!"]
],[ ],[
"start" "start"
@ -46,19 +42,13 @@
"start", "start",
["keyword.command.dosbatch","echo"], ["keyword.command.dosbatch","echo"],
["text"," "], ["text"," "],
["markup.list","%"], ["constant.numeric","%var1%%%G"]
["constant.other","var1"],
["markup.list","%"],
["constant.numeric","%%G"]
],[ ],[
"start", "start",
["keyword.command.dosbatch","attrib"], ["keyword.command.dosbatch","attrib"],
["text"," -r -a -h -s "], ["text"," -r -a -h -s "],
["punctuation.definition.string.begin.shell","\""], ["punctuation.definition.string.begin.shell","\""],
["markup.list","%"], ["constant.numeric","%var1%%%G"],
["constant.other","var1"],
["markup.list","%"],
["constant.numeric","%%G"],
["punctuation.definition.string.end.shell","\""], ["punctuation.definition.string.end.shell","\""],
["text"," /D /S"] ["text"," /D /S"]
],[ ],[

6
lib/ace/mouse/mouse_handler.js
View file

@ -50,8 +50,10 @@ var MouseHandler = function(editor) {
event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click")); event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click"));
event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove")); event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove"));
event.addMultiMouseDownListener(mouseTarget, [300, 300, 250], this, "onMouseEvent"); event.addMultiMouseDownListener(mouseTarget, [300, 300, 250], this, "onMouseEvent");
event.addMultiMouseDownListener(editor.renderer.scrollBarV.inner, [300, 300, 250], this, "onMouseEvent"); if (editor.renderer.scrollBarV) {
event.addMultiMouseDownListener(editor.renderer.scrollBarH.inner, [300, 300, 250], this, "onMouseEvent"); event.addMultiMouseDownListener(editor.renderer.scrollBarV.inner, [300, 300, 250], this, "onMouseEvent");
event.addMultiMouseDownListener(editor.renderer.scrollBarH.inner, [300, 300, 250], this, "onMouseEvent");
}
event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel")); event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel"));
var gutterEl = editor.renderer.$gutter; var gutterEl = editor.renderer.$gutter;