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

4
lib/ace/test/mockrenderer.js
View file

@ -115,10 +115,10 @@ MockRenderer.prototype.scrollToX = function(scrollTop) {};
MockRenderer.prototype.scrollToY = function(scrollLeft) {};
MockRenderer.prototype.scrollToLine = function(line, center) {
var lineHeight = { lineHeight: 16 };
var lineHeight = 16;
var row = 0;
for (var l = 1; l < line; l++) {
row += this.session.getRowHeight(lineHeight, l-1) / lineHeight.lineHeight;
row += this.session.getRowLength(l-1);
}
if (center) {