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

lint: PadMessageHandler.js

Browse source
This commit is contained in:
John McLear 2021-02-21 19:53:45 +00:00 • committed by Richard Hansen
parent d67f170c46
commit 5201cb717f
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/node/handler/PadMessageHandler.js
View file

@ -669,7 +669,8 @@ const handleUserChanges = async (socket, message) => {
if (Changeset.oldLen(changeset) !== prevText.length) { if (Changeset.oldLen(changeset) !== prevText.length) {
socket.json.send({disconnect: 'badChangeset'}); socket.json.send({disconnect: 'badChangeset'});
stats.meter('failedChangesets').mark(); stats.meter('failedChangesets').mark();
throw new Error(`Can't apply USER_CHANGES ${changeset} with oldLen ${Changeset.oldLen(changeset)} to document of length ${prevText.length}`); throw new Error(`Can't apply USER_CHANGES ${changeset} with oldLen ` +
`${Changeset.oldLen(changeset)} to document of length ${prevText.length}`);
} }
try { try {
@ -887,7 +888,8 @@ const handleClientReady = async (socket, message, authorID) => {
} }
if (message.protocolVersion !== 2) { if (message.protocolVersion !== 2) {
messageLogger.warn(`Dropped message, CLIENT_READY Message has a unknown protocolVersion '${message.protocolVersion}'!`); messageLogger.warn('Dropped message, CLIENT_READY Message has a unknown protocolVersion ' +
`'${message.protocolVersion}'!`);
return; return;
} }
@ -1085,12 +1087,16 @@ const handleClientReady = async (socket, message, authorID) => {
indentationOnNewLine: settings.indentationOnNewLine, indentationOnNewLine: settings.indentationOnNewLine,
scrollWhenFocusLineIsOutOfViewport: { scrollWhenFocusLineIsOutOfViewport: {
percentage: { percentage: {
editionAboveViewport: settings.scrollWhenFocusLineIsOutOfViewport.percentage.editionAboveViewport, editionAboveViewport:
editionBelowViewport: settings.scrollWhenFocusLineIsOutOfViewport.percentage.editionBelowViewport, settings.scrollWhenFocusLineIsOutOfViewport.percentage.editionAboveViewport,
editionBelowViewport:
settings.scrollWhenFocusLineIsOutOfViewport.percentage.editionBelowViewport,
}, },
duration: settings.scrollWhenFocusLineIsOutOfViewport.duration, duration: settings.scrollWhenFocusLineIsOutOfViewport.duration,
scrollWhenCaretIsInTheLastLineOfViewport: settings.scrollWhenFocusLineIsOutOfViewport.scrollWhenCaretIsInTheLastLineOfViewport, scrollWhenCaretIsInTheLastLineOfViewport:
percentageToScrollWhenUserPressesArrowUp: settings.scrollWhenFocusLineIsOutOfViewport.percentageToScrollWhenUserPressesArrowUp, settings.scrollWhenFocusLineIsOutOfViewport.scrollWhenCaretIsInTheLastLineOfViewport,
percentageToScrollWhenUserPressesArrowUp:
settings.scrollWhenFocusLineIsOutOfViewport.percentageToScrollWhenUserPressesArrowUp,
}, },
initialChangesets: [], // FIXME: REMOVE THIS SHIT initialChangesets: [], // FIXME: REMOVE THIS SHIT
}; };
@ -1380,7 +1386,8 @@ const composePadChangesets = async (padId, startNum, endNum) => {
// get all changesets // get all changesets
const changesets = {}; const changesets = {};
await Promise.all(changesetsNeeded.map( await Promise.all(changesetsNeeded.map(
(revNum) => pad.getRevisionChangeset(revNum).then((changeset) => changesets[revNum] = changeset) (revNum) => pad.getRevisionChangeset(revNum)
.then((changeset) => changesets[revNum] = changeset)
)); ));
// compose Changesets // compose Changesets
@ -1406,7 +1413,7 @@ const _getRoomSockets = (padID) => {
const room = socketio.sockets.adapter.rooms[padID]; const room = socketio.sockets.adapter.rooms[padID];
if (room) { if (room) {
for (const id in room.sockets) { for (const id of Object.keys(room.sockets)) {
roomSockets.push(socketio.sockets.sockets[id]); roomSockets.push(socketio.sockets.sockets[id]);
} }
} }