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

Merge branch 'master' of github.com:ajaxorg/editor

Browse source 
Conflicts:
	src/ace/layer/Marker.js
This commit is contained in:
mikedeboer 2010-09-22 14:56:43 +02:00
commit a533874b84
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ace/layer/Marker.js
View file

@ -5,7 +5,7 @@
* @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
* @author Fabian Jakobs <fabian AT ajax DOT org>
*/
require.def("ace/layer/Marker", [], function() {
require.def("ace/layer/Marker", ["ace/Range"], function(Range) {
var Marker = function(parentEl) {
this.element = document.createElement("div");
@ -74,12 +74,12 @@ var Marker = function(parentEl) {
// selection start
var row = range.start.row;
var lineRange = new ace.Range(row, range.start.column, row, this.doc.getLine(row).length);
var lineRange = new Range(row, range.start.column, row, this.doc.getLine(row).length);
this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig);
// selection end
var row = range.end.row;
var lineRange = new ace.Range(row, 0, row, range.end.column);
var lineRange = new Range(row, 0, row, range.end.column);
this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig);
for (var row = range.start.row + 1; row < range.end.row; row++) {