Modernize variable declarations

Author: simonbengtsson

README.md

@@ -58,7 +58,7 @@ The third usage option is with downloaded or CDN dist files
 <script src="jspdf.min.js"></script>
 <script src="jspdf.plugin.autotable.min.js"></script>
 <script>
-  var doc = new jsPDF()
+  const doc = new jsPDF()
   doc.autoTable({ html: '#my-table' })
   doc.save('table.pdf')
 </script>
@@ -226,7 +226,7 @@ To see what is included in the `Table`, `Row`, `Column` and `Cell` types, either
 autoTable(doc, {
   didDrawCell: (data) => {
     if (data.section === 'body' && data.column.index === 0) {
-      var base64Img = 'data:image/jpeg;base64,iVBORw0KGgoAAAANS...'
+      const base64Img = 'data:image/jpeg;base64,iVBORw0KGgoAAAANS...'
       doc.addImage(base64Img, 'JPEG', data.cell.x + 2, data.cell.y + 2, 10, 10)
     }
   },

examples/examples.js

@@ -12,20 +12,20 @@
  | for a minimal example.
  */
 
-var faker = window.faker
+const faker = window.faker
 
-var examples = {}
+const examples = {}
 window.examples = examples
 
 // Basic - shows what a default table looks like
 examples.basic = function () {
-  var doc = new jsPDF()
+  const doc = new jsPDF()
 
   // From HTML
   doc.autoTable({ html: '.table' })
 
   // From Javascript
-  var finalY = doc.lastAutoTable.finalY || 10
+  let finalY = doc.lastAutoTable.finalY || 10
   doc.text('From javascript arrays', 14, finalY + 15)
   doc.autoTable({
     startY: finalY + 20,
@@ -59,7 +59,7 @@ examples.basic = function () {
 
 // Minimal - shows how compact tables can be drawn
 examples.minimal = function () {
-  var doc = new jsPDF()
+  const doc = new jsPDF()
   doc.autoTable({
     html: '.table',
     tableWidth: 'wrap',
@@ -70,11 +70,11 @@ examples.minimal = function () {
 
 // Long data - shows how the overflow features looks and can be used
 examples.long = function () {
-  var doc = new jsPDF('l')
+  const doc = new jsPDF('l')
 
-  var head = headRows()
+  const head = headRows()
   head[0]['text'] = 'Text'
-  var body = bodyRows(4)
+  const body = bodyRows(4)
   body.forEach(function (row) {
     row['text'] = faker.lorem.sentence(100)
   })
@@ -107,17 +107,17 @@ examples.long = function () {
 
 // Content - shows how tables can be integrated with any other pdf content
 examples.content = function () {
-  var doc = new jsPDF()
+  const doc = new jsPDF()
 
   doc.setFontSize(18)
   doc.text('With content', 14, 22)
   doc.setFontSize(11)
   doc.setTextColor(100)
 
   // jsPDF 1.4+ uses getWidth, <1.4 uses .width
-  var pageSize = doc.internal.pageSize
-  var pageWidth = pageSize.width ? pageSize.width : pageSize.getWidth()
-  var text = doc.splitTextToSize(faker.lorem.sentence(45), pageWidth - 35, {})
+  const pageSize = doc.internal.pageSize
+  const pageWidth = pageSize.width ? pageSize.width : pageSize.getWidth()
+  const text = doc.splitTextToSize(faker.lorem.sentence(45), pageWidth - 35, {})
   doc.text(text, 14, 30)
 
   doc.autoTable({
@@ -134,12 +134,12 @@ examples.content = function () {
 
 // Multiple - shows how multiple tables can be drawn both horizontally and vertically
 examples.multiple = function () {
-  var doc = new jsPDF()
+  const doc = new jsPDF()
   doc.text('Multiple tables', 14, 20)
 
   doc.autoTable({ startY: 30, head: headRows(), body: bodyRows(25) })
 
-  var pageNumber = doc.internal.getNumberOfPages()
+  const pageNumber = doc.internal.getNumberOfPages()
 
   doc.autoTable({
     columns: [
@@ -169,7 +169,7 @@ examples.multiple = function () {
     margin: { left: 107 },
   })
 
-  for (var j = 0; j < 3; j++) {
+  for (let j = 0; j < 3; j++) {
     doc.autoTable({
       head: headRows(),
       body: bodyRows(),
@@ -183,8 +183,8 @@ examples.multiple = function () {
 
 // Header and footers - shows how header and footers can be drawn
 examples['header-footer'] = function () {
-  var doc = new jsPDF()
-  var totalPagesExp = '{total_pages_count_string}'
+  const doc = new jsPDF()
+  const totalPagesExp = '{total_pages_count_string}'
 
   doc.autoTable({
     head: headRows(),
@@ -200,16 +200,18 @@ examples['header-footer'] = function () {
     },
     didDrawPage: function (data) {
       // Footer
-      var str = 'Page ' + doc.internal.getNumberOfPages()
+      let str = 'Page ' + doc.internal.getNumberOfPages()
       // Total page number plugin only available in jspdf v1.0+
       if (typeof doc.putTotalPages === 'function') {
         str = str + ' of ' + totalPagesExp
       }
       doc.setFontSize(10)
 
       // jsPDF 1.4+ uses getHeight, <1.4 uses .height
-      var pageSize = doc.internal.pageSize
-      var pageHeight = pageSize.height ? pageSize.height : pageSize.getHeight()
+      const pageSize = doc.internal.pageSize
+      const pageHeight = pageSize.height
+        ? pageSize.height
+        : pageSize.getHeight()
       doc.text(str, data.settings.margin.left, pageHeight - 10)
     },
     margin: { top: 30 },
@@ -231,7 +233,7 @@ examples.defaults = function () {
     headStyles: { fillColor: 0 },
   })
 
-  var doc = new jsPDF()
+  const doc = new jsPDF()
 
   doc.text('Global options (black header)', 15, 20)
   doc.autoTable({ head: headRows(), body: bodyRows(5), startY: 25 })
@@ -241,22 +243,22 @@ examples.defaults = function () {
     {
       headStyles: { fillColor: [155, 89, 182] }, // Purple
       didDrawPage: function (data) {
-        var finalY = doc.lastAutoTable.finalY + 15
-        var leftMargin = data.settings.margin.left
+        const finalY = doc.lastAutoTable.finalY + 15
+        const leftMargin = data.settings.margin.left
         doc.text('Default options (purple header)', leftMargin, finalY)
       },
     },
     doc,
   )
 
-  var startY = doc.lastAutoTable.finalY + 20
+  const startY = doc.lastAutoTable.finalY + 20
   doc.autoTable({ head: headRows(), body: bodyRows(5), startY: startY })
 
   // Reset defaults
   doc.autoTableSetDefaults(null)
   jsPDF.autoTableSetDefaults(null)
 
-  var finalY = doc.lastAutoTable.finalY
+  const finalY = doc.lastAutoTable.finalY
   doc.text('After reset (blue header)', 15, finalY + 15)
   doc.autoTable({ head: headRows(), body: bodyRows(5), startY: finalY + 20 })
 
@@ -265,7 +267,7 @@ examples.defaults = function () {
 
 // Column styles - shows how tables can be drawn with specific column styles
 examples.colstyles = function () {
-  var doc = new jsPDF()
+  const doc = new jsPDF()
   doc.autoTable({
     head: headRows(),
     body: bodyRows(),
@@ -283,15 +285,15 @@ examples.colstyles = function () {
 
 // Col spans and row spans
 examples.spans = function () {
-  var doc = new jsPDF('p', 'pt')
+  const doc = new jsPDF('p', 'pt')
   doc.text('Rowspan and colspan', 40, 50)
 
-  var raw = bodyRows(40)
-  var body = []
+  const raw = bodyRows(40)
+  const body = []
 
-  for (var i = 0; i < raw.length; i++) {
-    var row = []
-    for (var key in raw[i]) {
+  for (let i = 0; i < raw.length; i++) {
+    const row = []
+    for (let key in raw[i]) {
       row.push(raw[i][key])
     }
     if (i % 5 === 0) {
@@ -323,7 +325,7 @@ examples.spans = function () {
 
 // Themes - shows how the different themes looks
 examples.themes = function () {
-  var doc = new jsPDF()
+  const doc = new jsPDF()
 
   doc.text('Theme "striped"', 14, 16)
   doc.autoTable({ head: headRows(), body: bodyRows(5), startY: 20 })
@@ -349,11 +351,11 @@ examples.themes = function () {
 
 // Nested tables
 examples.nested = function () {
-  var doc = new jsPDF()
+  const doc = new jsPDF()
   doc.text('Nested tables', 14, 16)
 
-  var nestedTableHeight = 100
-  var nestedTableCell = {
+  const nestedTableHeight = 100
+  const nestedTableCell = {
     content: '',
     // Dynamic height of nested tables are not supported right now
     // so we need to define height of the parent cell
@@ -390,7 +392,7 @@ examples.nested = function () {
 
 // Custom style - shows how custom styles can be applied
 examples.custom = function () {
-  var doc = new jsPDF()
+  const doc = new jsPDF()
   doc.autoTable({
     head: headRows(),
     body: bodyRows(),
@@ -505,7 +507,7 @@ examples.custom = function () {
 
 // Custom style - shows how custom styles can be applied
 examples.borders = function () {
-  var doc = new jsPDF()
+  const doc = new jsPDF()
   doc.autoTable({
     head: headRows(),
     body: bodyRows(3),
@@ -635,16 +637,16 @@ examples.borders = function () {
 
 // Split columns - shows how the overflowed columns split into pages
 examples.horizontalPageBreak = function () {
-  var doc = new jsPDF('l')
+  const doc = new jsPDF('l')
 
-  var head = headRows()
+  const head = headRows()
   head[0].region = 'Region'
   head[0].country = 'Country'
   head[0].zipcode = 'Zipcode'
   head[0].phone = 'Phone'
   // head[0].timeZone = 'Timezone';
   head[0]['text'] = 'Text'
-  var body = bodyRows(4)
+  const body = bodyRows(4)
   body.forEach(function (row) {
     row['text'] = faker.lorem.sentence(100)
     row['zipcode'] = faker.address.zipCode()
@@ -669,16 +671,16 @@ examples.horizontalPageBreak = function () {
 
 // Split columns - shows how the overflowed columns split into pages with a given column repeated
 examples.horizontalPageBreakRepeat = function () {
-  var doc = new jsPDF('l')
+  const doc = new jsPDF('l')
 
-  var head = headRows()
+  const head = headRows()
   head[0].region = 'Region'
   head[0].country = 'Country'
   head[0].zipcode = 'Zipcode'
   head[0].phone = 'Phone'
   // head[0].timeZone = 'Timezone';
   head[0]['text'] = 'Text'
-  var body = bodyRows(4)
+  const body = bodyRows(4)
   body.forEach(function (row) {
     row['text'] = faker.lorem.sentence(15)
     row['zipcode'] = faker.address.zipCode()
@@ -707,16 +709,16 @@ examples.horizontalPageBreakRepeat = function () {
 
 // Split columns - shows how to alter the behaviour of columns that split into pages
 examples.horizontalPageBreakBehaviour = function () {
-  var doc = new jsPDF('l')
+  const doc = new jsPDF('l')
 
-  var head = headRows()
+  const head = headRows()
   head[0].region = 'Region'
   head[0].country = 'Country'
   head[0].zipcode = 'Zipcode'
   head[0].phone = 'Phone'
   head[0].datetime = 'DateTime'
   head[0].text = 'Text'
-  var body = bodyRows(50)
+  const body = bodyRows(50)
   body.forEach(function (row) {
     row['text'] = faker.lorem.sentence(10)
     row['zipcode'] = faker.address.zipCode()
@@ -774,8 +776,8 @@ function columns() {
 
 function data(rowCount) {
   rowCount = rowCount || 10
-  var body = []
-  for (var j = 1; j <= rowCount; j++) {
+  const body = []
+  for (let j = 1; j <= rowCount; j++) {
     body.push({
       id: j,
       name: faker.name.findName(),
@@ -789,8 +791,8 @@ function data(rowCount) {
 
 function bodyRows(rowCount) {
   rowCount = rowCount || 10
-  var body = []
-  for (var j = 1; j <= rowCount; j++) {
+  const body = []
+  for (let j = 1; j <= rowCount; j++) {
     body.push({
       id: j,
       name: faker.name.findName(),