fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make stringIterator aware of newlines

This commit is contained in:
webzwo0i 2014-12-14 17:48:19 +01:00
parent 7df944b3fd
commit 251a75346d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/static/js/Changeset.js
View File

@ -507,6 +507,10 @@ exports.opAssembler = function () {
*/ */
exports.stringIterator = function (str) { exports.stringIterator = function (str) {
var curIndex = 0; var curIndex = 0;
var newLines = str.split("\n").length - 1
function getnewLines(){
return newLines
}
function assertRemaining(n) { function assertRemaining(n) {
exports.assert(n <= remaining(), "!(", n, " <= ", remaining(), ")"); exports.assert(n <= remaining(), "!(", n, " <= ", remaining(), ")");
@ -515,6 +519,7 @@ exports.stringIterator = function (str) {
function take(n) { function take(n) {
assertRemaining(n); assertRemaining(n);
var s = str.substr(curIndex, n); var s = str.substr(curIndex, n);
newLines -= s.split("\n").length - 1
curIndex += n; curIndex += n;
return s; return s;
} }
@ -537,7 +542,8 @@ exports.stringIterator = function (str) {
take: take, take: take,
skip: skip, skip: skip,
remaining: remaining, remaining: remaining,
peek: peek peek: peek,
newlines: getnewLines
}; };
}; };