mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove unnecessary code; because we have checks in every op now we don't

Browse source 
need this anymore
This commit is contained in:
webzwo0i 2015-02-15 15:12:24 +01:00
parent ac2c7e9679
commit e7f01fa498
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/static/js/Changeset.js
View file

@ -910,14 +910,11 @@ exports.pack = function (oldLen, newLen, opsStr, bank) {
* @params str {string} String to which a Changeset should be applied * @params str {string} String to which a Changeset should be applied
*/ */
exports.applyToText = function (cs, str) { exports.applyToText = function (cs, str) {
var totalNrOfLines = str.split("\n").length - 1;
var removedLines = 0;
var unpacked = exports.unpack(cs); var unpacked = exports.unpack(cs);
exports.assert(str.length == unpacked.oldLen, "mismatched apply: ", str.length, " / ", unpacked.oldLen); exports.assert(str.length == unpacked.oldLen, "mismatched apply: ", str.length, " / ", unpacked.oldLen);
var csIter = exports.opIterator(unpacked.ops); var csIter = exports.opIterator(unpacked.ops);
var bankIter = exports.stringIterator(unpacked.charBank); var bankIter = exports.stringIterator(unpacked.charBank);
var strIter = exports.stringIterator(str); var strIter = exports.stringIterator(str);
var newlines = 0
var newlinefail = false var newlinefail = false
var assem = exports.stringAssembler(); var assem = exports.stringAssembler();
while (csIter.hasNext()) { while (csIter.hasNext()) {
@ -937,7 +934,6 @@ exports.applyToText = function (cs, str) {
if(op.lines != strIter.peek(op.chars).split("\n").length - 1){ if(op.lines != strIter.peek(op.chars).split("\n").length - 1){
newlinefail = true newlinefail = true
} }
removedLines += op.lines;
strIter.skip(op.chars); strIter.skip(op.chars);
break; break;
case '=': case '=':
@ -946,12 +942,10 @@ exports.applyToText = function (cs, str) {
if(op.lines != strIter.peek(op.chars).split("\n").length - 1){ if(op.lines != strIter.peek(op.chars).split("\n").length - 1){
newlinefail = true newlinefail = true
} }
newlines = strIter.newlines()
assem.append(strIter.take(op.chars)); assem.append(strIter.take(op.chars));
break; break;
} }
} }
exports.assert(totalNrOfLines >= removedLines,"cannot remove ", removedLines, " lines from text with ", totalNrOfLines, " lines");
assem.append(strIter.take(strIter.remaining())); assem.append(strIter.take(strIter.remaining()));
return [assem.toString(),newlinefail]; return [assem.toString(),newlinefail];
}; };