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

working

Browse source
This commit is contained in:
John McLear 2021-01-14 17:02:43 +00:00
parent b876e2dfe0
commit d9ca1efd4f
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/static/js/contentcollector.js
View file

@ -394,11 +394,10 @@ const makeContentCollector = function (
const styl = dom.nodeAttr(node, 'style'); const styl = dom.nodeAttr(node, 'style');
const cls = dom.nodeAttr(node, 'class'); const cls = dom.nodeAttr(node, 'class');
// clear to avoid pollution of trailing blank lines after lines with attributes // clear to avoid pollution of trailing blank lines after image lines
// during import // with attributes during import
if (state.lineAttributes) { if (state.lineAttributes && state.lineAttributes.img) {
delete state.lineAttributes; delete state.lineAttributes.img;
state.lineAttributes = {};
} }
if (tname === 'img') { if (tname === 'img') {
@ -420,7 +419,6 @@ const makeContentCollector = function (
// be present in the line itself, not in any attributes of a line.. // be present in the line itself, not in any attributes of a line..
// uncommenting the below will make duplicate images.. :) // uncommenting the below will make duplicate images.. :)
if (state.lineAttributes) delete state.lineAttributes; if (state.lineAttributes) delete state.lineAttributes;
console.warn("state", state);
this.breakLine = true; this.breakLine = true;
const tvalue = dom.nodeAttr(node, 'value'); const tvalue = dom.nodeAttr(node, 'value');
const induceLineBreak = hooks.callAll('collectContentLineBreak', { const induceLineBreak = hooks.callAll('collectContentLineBreak', {

8
tests/backend/specs/contentcollector.js
View file

File diff suppressed because one or more lines are too long