v2.5.25

`data-pdfmake` is now handled the same way across the library

Author: Aymkdn

browser.js

@@ -116,7 +116,7 @@ <h1>HTML to PDFMake convertor</h1>
       <div id="pdf_ie" style="display:none;padding:3em">The PDF file is sent to you for download. Use a modern browser (like Chrome or Firefox) to display the PDF in this page.</div>
     </div>
   </div>
-  <script src="browser-2.5.24.js"></script>
+  <script src="browser-2.5.25.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/pdfmake@latest/build/pdfmake.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/pdfmake@latest/build/vfs_fonts.js"></script>
   <script>

docs/browser-2.5.24.js

@@ -401,8 +401,7 @@ function htmlToPdfMake(htmlText, options) {
             // check if we have some data-pdfmake to apply
             if (element.dataset && element.dataset.pdfmake) {
               // handle when people will use simple quotes, e.g. <table data-pdfmake="{'layout':'noBorders'}">
-              dataset = element.dataset.pdfmake;
-              if (dataset.charAt(1) === "'") dataset=dataset.replace(/'/g,'"');
+              dataset = element.dataset.pdfmake.replace(/'/g,'"');
               try {
                 dataset = JSON.parse(dataset);
                 for (key in dataset) {
@@ -456,9 +455,14 @@ function htmlToPdfMake(htmlText, options) {
             };
             // we can override the default HR style with "data-pdfmake"
             if (element.dataset && element.dataset.pdfmake) {
-              dataset = JSON.parse(element.dataset.pdfmake);
-              for (key in dataset) {
-                styleHR[key] = dataset[key];
+              dataset = element.dataset.pdfmake.replace(/'/g, '"');
+              try {
+                dataset = JSON.parse(dataset);
+                for (key in dataset) {
+                  styleHR[key] = dataset[key];
+                }
+              } catch (e) {
+                console.error(e);
               }
             }
 
@@ -592,9 +596,15 @@ function htmlToPdfMake(htmlText, options) {
 
         // check if we have some data-pdfmake to apply
         if (['HR','TABLE'].indexOf(nodeName) === -1 && element.dataset && element.dataset.pdfmake) {
-          dataset = JSON.parse(element.dataset.pdfmake);
-          for (key in dataset) {
-            ret[key] = dataset[key];
+          // handle when people will use simple quotes
+          dataset = element.dataset.pdfmake.replace(/'/g, '"');
+          try {
+            dataset = JSON.parse(dataset);
+            for (key in dataset) {
+              ret[key] = dataset[key];
+            }
+          } catch (e) {
+            console.error(e);
           }
         }
 

docs/browser-2.5.25.js

@@ -1,6 +1,6 @@
 {
   "name": "html-to-pdfmake",
-  "version": "2.5.24",
+  "version": "2.5.25",
   "description": "Convert HTML code to PDFMake",
   "main": "index.js",
   "scripts": {

docs/index.html

@@ -1196,7 +1196,7 @@ test("unit tests", function(t) {
   });
 
   t.test("columns",function(t) {
-    var html = `<div data-pdfmake-type="columns"><div data-pdfmake='{"width": "*"}'></div><div style="width:auto">stuff centered</div><div data-pdfmake='{"width": "*"}'></div></div>`;
+    var html = `<div data-pdfmake-type="columns"><div data-pdfmake='{"width": "*"}'></div><div style="width:auto">stuff centered</div><div data-pdfmake="{ 'width': '*' } "></div></div>`;
     var ret = htmlToPdfMake(html, {
       window:window
     });