Skip to content

Get y coordinate from generated block from html, clear y coordinate after page break #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 29, 2016
Merged

Get y coordinate from generated block from html, clear y coordinate after page break #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
edf1c20
enable settings of font size via css definition
jirikavi Jul 2, 2015
29f3e9b
get y coordinate after html rendering to PDF
jirikavi Jul 2, 2015
47e237b
enable dynamic set up of printHeaders
jirikavi Jul 2, 2015
e5844dc
fix position of elements in PDF after page break
jirikavi Jul 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion plugins/cell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@

jsPDFAPI.cell = function (x, y, w, h, txt, ln, align) {
var curCell = getLastCellPosition();
var pgAdded = false;

// If this is not the first cell, we must change its position
if (curCell.ln !== undefined) {
Expand All @@ -117,13 +118,14 @@
var margins = this.margins || NO_MARGINS;
if ((curCell.y + curCell.h + h + margin) >= this.internal.pageSize.height - margins.bottom) {
this.cellAddPage();
pgAdded = true;
if (this.printHeaders && this.tableHeaderRow) {
this.printHeaderRow(ln, true);
}
}
//We ignore the passed y: the lines may have diferent heights
y = (getLastCellPosition().y + getLastCellPosition().h);

if (pgAdded) y = margin + 10;
}
}

Expand Down Expand Up @@ -233,6 +235,9 @@
if(config.fontSize){
fontSize = config.fontSize;
}
if (config.css['font-size']) {
fontSize = config.css['font-size'] * 16;
}
if(config.margins){
margins = config.margins;
}
Expand Down Expand Up @@ -390,6 +395,7 @@

tableHeaderCell = this.tableHeaderRow[i];
if (new_page) {
this.margins.top = margin;
tableHeaderCell[1] = this.margins && this.margins.top || 0;
tempHeaderConf.push(tableHeaderCell);
}
Expand Down
6 changes: 4 additions & 2 deletions plugins/from_html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,9 @@
renderer.y += 10;
renderer.pdf.table(renderer.x, renderer.y, table2json.rows, table2json.headers, {
autoSize : false,
printHeaders : true,
margins : renderer.pdf.margins_doc
printHeaders: elementHandlers.printHeaders,
margins: renderer.pdf.margins_doc,
css: GetCSS(cn)
});
renderer.y = renderer.pdf.lastCellPos.y + renderer.pdf.lastCellPos.h + 20;
} else if (cn.nodeName === "OL" || cn.nodeName === "UL") {
Expand Down Expand Up @@ -502,6 +503,7 @@
}
i++;
}
elementHandlers.outY = renderer.y;

if (isBlock) {
return renderer.setBlockBoundary(cb);
Expand Down