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

Merge remote-tracking branch 'origin/master' into indent_guides

Browse source 
Conflicts:
	lib/ace/theme/textmate.css
This commit is contained in:
Lennart Kats 2012-08-10 09:51:03 +02:00
commit 768bfbb1f2
19 changed files with 155 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ace/layer/gutter.js
View file

@ -129,7 +129,7 @@ var Gutter = function(parentEl) {
breakpoints[i] ? " ace_breakpoint " : " ",
annotation.className,
"' title='", annotation.text.join("\n"),
"' style='height:", this.session.getRowLength(i) * config.lineHeight, "px;'>", (i+1));
"' style='height:", this.session.getRowLength(i) * config.lineHeight, "px;'>", (i));
if (foldWidgets) {
var c = foldWidgets[i];