Fix bug in posFromMouse for rectangular coords

marijnh · marijnh · commit afcbdb6b4cbb · 2014-04-22T10:23:01.000+02:00
It was returning negative values in the ch field. Issue #2485
diff --git a/lib/codemirror.js b/lib/codemirror.js
@@ -2507,7 +2507,7 @@
     var coords = coordsChar(cm, x, y), line;
     if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
       var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
-      coords = Pos(coords.line, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff);
+      coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
     }
     return coords;
   }

Original file line number	Diff line number	Diff line change
`@@ -2507,7 +2507,7 @@`
`2507`	`2507`	`var coords = coordsChar(cm, x, y), line;`
`2508`	`2508`	`if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {`
`2509`	`2509`	`var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;`
`2510`		`- coords = Pos(coords.line, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff);`
	`2510`	`+ coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));`
`2511`	`2511`	`}`
`2512`	`2512`	`return coords;`
`2513`	`2513`	`}`