fix canvg_context2d examples (#3358)

Co-authored-by: Lukas Holländer <[email protected]>
parallax · Jan 21, 2022 · 513a4da · 513a4da
1 parent a29c092
commit 513a4da
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 31 deletions.
diff --git a/examples/canvg_context2d/bar_graph_with_text_and_lines.html b/examples/canvg_context2d/bar_graph_with_text_and_lines.html
@@ -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>
 
@@ -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;
@@ -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>

diff --git a/examples/canvg_context2d/piechart.html b/examples/canvg_context2d/piechart.html
@@ -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>
 
@@ -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;
@@ -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>