Skip to content

Commit 3b4bfa5

Browse files
committed
refactor spacing
1 parent 1d47f08 commit 3b4bfa5

1 file changed

Lines changed: 4 additions & 9 deletions

File tree

jspdf.plugin.from_html.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@
238238
EMBED : 1
239239
};
240240
var listCount = 1;
241-
var lastCn;
242241
DrillForContent = function(element, renderer, elementHandlers) {
243242
var cn, cns, fragmentCSS, i, isBlock, l, px2pt, table2json;
244243
cns = element.childNodes;
@@ -278,12 +277,11 @@
278277
});
279278
renderer.y = renderer.pdf.lastCellPos.y + renderer.pdf.lastCellPos.h + 20;
280279
} else if (cn.nodeName === "OL" || cn.nodeName === "UL") {
281-
renderer.y += 10;
282280
listCount = 1;
283-
lastCn = cn;
284281
if (!elementHandledElsewhere(cn, renderer, elementHandlers)) {
285282
DrillForContent(cn, renderer, elementHandlers);
286283
}
284+
renderer.y += 10;
287285
} else if (cn.nodeName === "LI") {
288286
var temp = renderer.x;
289287
renderer.x += cn.parentNode.nodeName === "UL" ? 22 : 10;
@@ -292,10 +290,6 @@
292290
}
293291
renderer.x = temp;
294292
} else {
295-
if (lastCn && (lastCn.nodeName === "UL" || lastCn.nodeName === "OL")) {
296-
renderer.y += 10;
297-
lastCn = false;
298-
}
299293
if (!elementHandledElsewhere(cn, renderer, elementHandlers)) {
300294
DrillForContent(cn, renderer, elementHandlers);
301295
}
@@ -304,9 +298,9 @@
304298
var value = cn.nodeValue;
305299
if (cn.nodeValue && cn.parentNode.nodeName === "LI") {
306300
if (cn.parentNode.parentNode.nodeName === "OL") {
307-
value = listCount++ + ". " + value;
301+
value = listCount++ + '. ' + value;
308302
} else {
309-
renderer.pdf.circle(renderer.x - 9, renderer.y + 9, 2, "FD");
303+
renderer.pdf.circle(renderer.x - 9, renderer.y + 9, 2, 'FD');
310304
}
311305
}
312306
renderer.addText(value, fragmentCSS);
@@ -316,6 +310,7 @@
316310
}
317311
i++;
318312
}
313+
319314
if (isBlock) {
320315
return renderer.setBlockBoundary();
321316
}

0 commit comments

Comments
 (0)