libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

Pad: Convert line endings in text from padDefaultContent hook

Browse source
This commit is contained in:
Richard Hansen 2022-02-23 21:08:41 -05:00
parent cd43625be8
commit b733ed9ab0
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/node/db/Pad.js
View file

@ -387,15 +387,10 @@ Pad.prototype.init = async function (text, authorId = '') {
}
} else {
if (text == null) {
const context = {
pad: this,
authorId,
type: 'text',
content: exports.cleanText(settings.defaultPadText),
};
const context = {pad: this, authorId, type: 'text', content: settings.defaultPadText};
await hooks.aCallAll('padDefaultContent', context);
if (context.type !== 'text') throw new Error(`unsupported content type: ${context.type}`);
text = context.content;
text = exports.cleanText(context.content);
}
const firstChangeset = Changeset.makeSplice('\n', 0, 0, text);
await this.appendRevision(firstChangeset, authorId);

12
src/tests/backend/specs/Pad.js
View file

@ -118,5 +118,17 @@ describe(__filename, function () {
pad = await padManager.getPad(padId);
assert.equal(pad.text(), `${want}\n`);
});
it('cleans provided content', async function () {
const input = 'foo\r\nbar\r\tbaz';
const want = 'foo\nbar\n baz';
assert.notEqual(want, settings.defaultPadText);
plugins.hooks.padDefaultContent.push({hook_fn: async (hookName, ctx) => {
ctx.type = 'text';
ctx.content = input;
}});
pad = await padManager.getPad(padId);
assert.equal(pad.text(), `${want}\n`);
});
});
});