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 1

lint: Changeset.js curly braces in correct position

Browse source
This commit is contained in:
John McLear 2021-02-17 16:02:10 +00:00
parent 23d7544763
commit 0b78ad2f90
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2016,21 +2016,19 @@ exports.follow = (cs1, cs2, reverseInsertOrder, pool) => {
whichToDo = 1; whichToDo = 1;
} else if (insertFirst2 && !insertFirst1) { } else if (insertFirst2 && !insertFirst1) {
whichToDo = 2; whichToDo = 2;
} } else if (firstChar1 === '\n' && firstChar2 !== '\n') {
// insert string that doesn't start with a newline first so as not to break up lines // insert string that doesn't start with a newline first so as not to break up lines
else if (firstChar1 == '\n' && firstChar2 != '\n') {
whichToDo = 2; whichToDo = 2;
} else if (firstChar1 != '\n' && firstChar2 == '\n') { } else if (firstChar1 !== '\n' && firstChar2 === '\n') {
whichToDo = 1; whichToDo = 1;
} } else if (reverseInsertOrder) {
// break symmetry: // break symmetry:
else if (reverseInsertOrder) {
whichToDo = 2; whichToDo = 2;
} else { } else {
whichToDo = 1; whichToDo = 1;
} }
} }
if (whichToDo == 1) { if (whichToDo === 1) {
chars1.skip(op1.chars); chars1.skip(op1.chars);
opOut.opcode = '='; opOut.opcode = '=';
opOut.lines = op1.lines; opOut.lines = op1.lines;