Merge branch 'release/v0.8.2'

Author: eKoopmans

README.md

@@ -4,23 +4,23 @@ html2pdf converts any webpage or element into a printable PDF entirely client-si
 
 ## Getting started
 
-### HTML
+#### HTML
 
 The simplest way to use html2pdf is to download `dist/html2pdf.bundle.min.js` to your project folder and include it in your HTML with:
 
 ```html
 <script src="html2pdf.bundle.min.js"></script>
 ```
 
-*[Click here](#dependencies) for more information about using the unbundled version `dist/html2canvas.min.js`.*
+*Note: [Click here](#dependencies) for more information about using the unbundled version `dist/html2canvas.min.js`.*
 
-### NPM
+#### NPM
 
 Install html2pdf and its dependencies using NPM with `npm install --save html2pdf.js` (make sure to include `.js` in the package name).
 
 *Note: You can use NPM to create your project, but html2pdf **will not run in Node.js**, it must be run in a browser.*
 
-### Bower
+#### Bower
 
 Install html2pdf and its dependencies using Bower with `bower install --save html2pdf.js` (make sure to include `.js` in the package name).
 

dist/html2pdf.bundle.js

@@ -1,5 +1,5 @@
 /**
- * html2pdf.js v0.8.1
+ * html2pdf.js v0.8.2
  * Copyright (c) 2017 Erik Koopmans
  * Released under the MIT License.
  */
@@ -5172,12 +5172,13 @@ var html2pdf = function html2pdf(source, opt) {
 
   // Render the canvas and pass the result to makePDF.
   var onRendered = opt.html2canvas.onrendered || function () {};
-  opt.html2canvas.onrendered = function (canvas) {
+  delete opt.html2canvas.onrendered;
+  var done = function done(canvas) {
     onRendered(canvas);
     document.body.removeChild(overlay);
     html2pdf.makePDF(canvas, pageSize, opt);
   };
-  html2canvas$1(container, opt.html2canvas);
+  html2canvas$1(container, opt.html2canvas).then(done);
 };
 
 html2pdf.parseInput = function (source, opt) {

dist/html2pdf.bundle.min.js

@@ -1,5 +1,5 @@
 /**
- * html2pdf.js v0.8.1
+ * html2pdf.js v0.8.2
  * Copyright (c) 2017 Erik Koopmans
  * Released under the MIT License.
  */
@@ -231,12 +231,13 @@ var html2pdf = function html2pdf(source, opt) {
 
   // Render the canvas and pass the result to makePDF.
   var onRendered = opt.html2canvas.onrendered || function () {};
-  opt.html2canvas.onrendered = function (canvas) {
+  delete opt.html2canvas.onrendered;
+  var done = function done(canvas) {
     onRendered(canvas);
     document.body.removeChild(overlay);
     html2pdf.makePDF(canvas, pageSize, opt);
   };
-  html2canvas(container, opt.html2canvas);
+  html2canvas(container, opt.html2canvas).then(done);
 };
 
 html2pdf.parseInput = function (source, opt) {

dist/html2pdf.js

@@ -1,5 +1,5 @@
 /**
- * html2pdf.js v0.8.1
+ * html2pdf.js v0.8.2
  * Copyright (c) 2017 Erik Koopmans
  * Released under the MIT License.
  */
@@ -226,12 +226,13 @@ var html2pdf = function html2pdf(source, opt) {
 
   // Render the canvas and pass the result to makePDF.
   var onRendered = opt.html2canvas.onrendered || function () {};
-  opt.html2canvas.onrendered = function (canvas) {
+  delete opt.html2canvas.onrendered;
+  var done = function done(canvas) {
     onRendered(canvas);
     document.body.removeChild(overlay);
     html2pdf.makePDF(canvas, pageSize, opt);
   };
-  html2canvas(container, opt.html2canvas);
+  html2canvas(container, opt.html2canvas).then(done);
 };
 
 html2pdf.parseInput = function (source, opt) {

dist/html2pdf.min.js

@@ -1,5 +1,5 @@
 /**
- * html2pdf.js v0.8.1
+ * html2pdf.js v0.8.2
  * Copyright (c) 2017 Erik Koopmans
  * Released under the MIT License.
  */
@@ -230,12 +230,13 @@ var html2pdf = function html2pdf(source, opt) {
 
   // Render the canvas and pass the result to makePDF.
   var onRendered = opt.html2canvas.onrendered || function () {};
-  opt.html2canvas.onrendered = function (canvas) {
+  delete opt.html2canvas.onrendered;
+  var done = function done(canvas) {
     onRendered(canvas);
     document.body.removeChild(overlay);
     html2pdf.makePDF(canvas, pageSize, opt);
   };
-  html2canvas(container, opt.html2canvas);
+  html2canvas(container, opt.html2canvas).then(done);
 };
 
 html2pdf.parseInput = function (source, opt) {

dist/include/html2pdf.es.js

@@ -1,6 +1,6 @@
 {
   "name": "html2pdf.js",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Client-side HTML-to-PDF rendering using pure JS",
   "main": "dist/require/html2pdf.cjs.js",
   "module": "dist/include/html2pdf.es.js",

dist/require/html2pdf.cjs.js

@@ -50,12 +50,13 @@ var html2pdf = function(source, opt) {
 
   // Render the canvas and pass the result to makePDF.
   var onRendered = opt.html2canvas.onrendered || function() {};
-  opt.html2canvas.onrendered = function(canvas) {
+  delete opt.html2canvas.onrendered;
+  var done = function(canvas) {
     onRendered(canvas);
     document.body.removeChild(overlay);
     html2pdf.makePDF(canvas, pageSize, opt);
-  }
-  html2canvas(container, opt.html2canvas);
+  };
+  html2canvas(container, opt.html2canvas).then(done);
 };
 
 html2pdf.parseInput = function(source, opt) {