Skip to content

Fix canvg_context2d examples #3358

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 2 commits into from
Jan 21, 2022
Merged

Fix canvg_context2d examples #3358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a284c82
fix canvg_context2d examples
artu-ole Jan 18, 2022
ac29378
Merge branch 'master' into master
HackbrettXXX Jan 21, 2022
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
27 changes: 11 additions & 16 deletions examples/canvg_context2d/bar_graph_with_text_and_lines.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<script type="text/javascript"
src="https://cdnjs.cloudflare.com/ajax/libs/stackblur-canvas/1.4.1/stackblur.min.js"></script>
<!-- Main canvg code -->
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/canvg/dist/browser/canvg.min.js"></script>
<script src="../../dist/jspdf.debug.js"></script>
<script src="../../node_modules/canvg/dist/browser/canvg.min.js"></script>
<script src="../../dist/jspdf.umd.js"></script>
<script src="../../node_modules/canvg/lib/umd.js"></script>

</head>

Expand Down Expand Up @@ -823,13 +822,13 @@ <h1>Bar Graph With Text And Lines</h1>
});
}

window.onload = function () {
doRefresh();
window.onload = async () => {
await doRefresh();
};

var doRefresh = function () {
var makePdf = function () {
var pdf = new jsPDF('p', 'pt', 'c1');
var doRefresh = async () => {
var makePdf = async () => {
var pdf = new jspdf.jsPDF('p', 'pt', 'c1');
var c = pdf.canvas;
c.width = 1000;
c.height = 500;
Expand All @@ -840,16 +839,12 @@ <h1>Bar Graph With Text And Lines</h1>
ctx.fillRect(0, 0, 1000, 700);

//load a svg snippet in the canvas with id = 'drawingArea'
canvg(c, document.getElementById('svg').outerHTML, {
ignoreMouse: true,
ignoreAnimation: true,
ignoreDimensions: true
});

const v = await canvg.Canvg.from(ctx, document.getElementById('svg').outerHTML, canvg.presets.offscreen());
await v.render();
return pdf;
};
document.getElementById('result').setAttribute('src', makePdf().output('dataurlstring'));
document.getElementById('source').innerText = makePdf().output();
document.getElementById('result').setAttribute('src', (await makePdf()).output('dataurlstring'));
document.getElementById('source').innerText = (await makePdf()).output();
//makePdf().save();
};
</script>
Expand Down
26 changes: 11 additions & 15 deletions examples/canvg_context2d/piechart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
<script type="text/javascript"
src="https://cdnjs.cloudflare.com/ajax/libs/stackblur-canvas/1.4.1/stackblur.min.js"></script>
<!-- Main canvg code -->
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/canvg/dist/browser/canvg.min.js"></script>
<script src="../../dist/jspdf.debug.js"></script>
<script src="../../node_modules/canvg/dist/browser/canvg.min.js"></script>
<script src="../../dist/jspdf.umd.js"></script>
<script src="../../node_modules/canvg/lib/umd.js"></script>

</head>

Expand Down Expand Up @@ -57,13 +56,13 @@ <h1>Pie-Chart</h1>
});
}

window.onload = function () {
doRefresh();
window.onload = async () => {
await doRefresh();
};

var doRefresh = function () {
var makePdf = function () {
var pdf = new jsPDF('p', 'pt', 'c1');
var doRefresh = async () => {
var makePdf = async () => {
var pdf = new jspdf.jsPDF('p', 'pt', 'c1');
var c = pdf.canvas;
c.width = 1000;
c.height = 500;
Expand All @@ -74,16 +73,13 @@ <h1>Pie-Chart</h1>
ctx.fillRect(0, 0, 1000, 700);

//load a svg snippet in the canvas with id = 'drawingArea'
canvg(c, document.getElementById('svg').outerHTML, {
ignoreMouse: true,
ignoreAnimation: true,
ignoreDimensions: true
});
const v = await canvg.Canvg.from(ctx, document.getElementById('svg').outerHTML, canvg.presets.offscreen());
await v.render();

return pdf;
};
document.getElementById('result').setAttribute('src', makePdf().output('dataurlstring'));
document.getElementById('source').innerText = makePdf().output();
document.getElementById('result').setAttribute('src', (await makePdf()).output('dataurlstring'));
document.getElementById('source').innerText = (await makePdf()).output();
//makePdf().save();
};
</script>
Expand Down