Skip to content

Commit 513a4da

Browse files
fix canvg_context2d examples (#3358)
Co-authored-by: Lukas Holländer <lukas.hollaender@yworks.com>
1 parent a29c092 commit 513a4da

File tree

2 files changed

+22
-31
lines changed

2 files changed

+22
-31
lines changed

examples/canvg_context2d/bar_graph_with_text_and_lines.html

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
<script type="text/javascript"
1111
src="https://cdnjs.cloudflare.com/ajax/libs/stackblur-canvas/1.4.1/stackblur.min.js"></script>
1212
<!-- Main canvg code -->
13-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/canvg/dist/browser/canvg.min.js"></script>
14-
<script src="../../dist/jspdf.debug.js"></script>
15-
<script src="../../node_modules/canvg/dist/browser/canvg.min.js"></script>
13+
<script src="../../dist/jspdf.umd.js"></script>
14+
<script src="../../node_modules/canvg/lib/umd.js"></script>
1615

1716
</head>
1817

@@ -823,13 +822,13 @@ <h1>Bar Graph With Text And Lines</h1>
823822
});
824823
}
825824

826-
window.onload = function () {
827-
doRefresh();
825+
window.onload = async () => {
826+
await doRefresh();
828827
};
829828

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

842841
//load a svg snippet in the canvas with id = 'drawingArea'
843-
canvg(c, document.getElementById('svg').outerHTML, {
844-
ignoreMouse: true,
845-
ignoreAnimation: true,
846-
ignoreDimensions: true
847-
});
848-
842+
const v = await canvg.Canvg.from(ctx, document.getElementById('svg').outerHTML, canvg.presets.offscreen());
843+
await v.render();
849844
return pdf;
850845
};
851-
document.getElementById('result').setAttribute('src', makePdf().output('dataurlstring'));
852-
document.getElementById('source').innerText = makePdf().output();
846+
document.getElementById('result').setAttribute('src', (await makePdf()).output('dataurlstring'));
847+
document.getElementById('source').innerText = (await makePdf()).output();
853848
//makePdf().save();
854849
};
855850
</script>

examples/canvg_context2d/piechart.html

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
<script type="text/javascript"
1111
src="https://cdnjs.cloudflare.com/ajax/libs/stackblur-canvas/1.4.1/stackblur.min.js"></script>
1212
<!-- Main canvg code -->
13-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/canvg/dist/browser/canvg.min.js"></script>
14-
<script src="../../dist/jspdf.debug.js"></script>
15-
<script src="../../node_modules/canvg/dist/browser/canvg.min.js"></script>
13+
<script src="../../dist/jspdf.umd.js"></script>
14+
<script src="../../node_modules/canvg/lib/umd.js"></script>
1615

1716
</head>
1817

@@ -57,13 +56,13 @@ <h1>Pie-Chart</h1>
5756
});
5857
}
5958

60-
window.onload = function () {
61-
doRefresh();
59+
window.onload = async () => {
60+
await doRefresh();
6261
};
6362

64-
var doRefresh = function () {
65-
var makePdf = function () {
66-
var pdf = new jsPDF('p', 'pt', 'c1');
63+
var doRefresh = async () => {
64+
var makePdf = async () => {
65+
var pdf = new jspdf.jsPDF('p', 'pt', 'c1');
6766
var c = pdf.canvas;
6867
c.width = 1000;
6968
c.height = 500;
@@ -74,16 +73,13 @@ <h1>Pie-Chart</h1>
7473
ctx.fillRect(0, 0, 1000, 700);
7574

7675
//load a svg snippet in the canvas with id = 'drawingArea'
77-
canvg(c, document.getElementById('svg').outerHTML, {
78-
ignoreMouse: true,
79-
ignoreAnimation: true,
80-
ignoreDimensions: true
81-
});
76+
const v = await canvg.Canvg.from(ctx, document.getElementById('svg').outerHTML, canvg.presets.offscreen());
77+
await v.render();
8278

8379
return pdf;
8480
};
85-
document.getElementById('result').setAttribute('src', makePdf().output('dataurlstring'));
86-
document.getElementById('source').innerText = makePdf().output();
81+
document.getElementById('result').setAttribute('src', (await makePdf()).output('dataurlstring'));
82+
document.getElementById('source').innerText = (await makePdf()).output();
8783
//makePdf().save();
8884
};
8985
</script>

0 commit comments

Comments
 (0)