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

add newline counting for - and + op

This commit is contained in:
webzwo0i 2015-02-15 15:09:38 +01:00
parent b4d4b16b1f
commit ac2c7e9679
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -924,18 +924,30 @@ exports.applyToText = function (cs, str) {
var op = csIter.next();
switch (op.opcode) {
case '+':
//op is + and op.lines 0: no newlines must be in op.chars
//op is + and op.lines >0: op.chars must include op.lines newlines
if(op.lines != bankIter.peek(op.chars).split("\n").length - 1){
newlinefail = true
}
assem.append(bankIter.take(op.chars));
break;
case '-':
//op is - and op.lines 0: no newlines must be in the deleted string
//op is - and op.lines >0: op.lines newlines must be in the deleted string
if(op.lines != strIter.peek(op.chars).split("\n").length - 1){
newlinefail = true
}
removedLines += op.lines;
strIter.skip(op.chars);
break;
case '=':
newlines = strIter.newlines()
assem.append(strIter.take(op.chars));
if(newlines - strIter.newlines() != op.lines){
//op is = and op.lines 0: no newlines must be in the copied string
//op is = and op.lines >0: op.lines newlines must be in the copied string
if(op.lines != strIter.peek(op.chars).split("\n").length - 1){
newlinefail = true
}
newlines = strIter.newlines()
assem.append(strIter.take(op.chars));
break;
}
}