summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorwebzwo0i <webzwo0i@c3d2.de>2015-02-14 16:41:50 +0100
committerwebzwo0i <webzwo0i@c3d2.de>2015-02-14 16:41:50 +0100
commitc191a8716ebee37f61cdd4b07aff41f52e90c604 (patch)
tree78fdf5d30b0456c5914b128a9a691ffe02cdd751 /src
parente39b4428405d186796c56bb0fd18785bec0b5628 (diff)
downloadetherpad-lite-c191a8716ebee37f61cdd4b07aff41f52e90c604.zip
totally wrong, introduced by myself in
3354b9406b94e1a04b5eee1c0152914dde73ba89 the first part is always false so the second part which is always true in case a cs deleted some lines was never triggered...sigh
Diffstat (limited to 'src')
-rw-r--r--src/static/js/Changeset.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index 32da887d..fd658f86 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -927,16 +927,12 @@ exports.applyToText = function (cs, str) {
break;
case '-':
removedLines += op.lines;
- newlines = strIter.newlines()
strIter.skip(op.chars);
- if(!(newlines - strIter.newlines() == 0) && (newlines - strIter.newlines() != op.lines)){
- newlinefail = true
- }
break;
case '=':
newlines = strIter.newlines()
assem.append(strIter.take(op.chars));
- if(!(newlines - strIter.newlines() == op.lines)){
+ if(newlines - strIter.newlines() != op.lines){
newlinefail = true
}
break;