Merge remote-tracking branch 'origin/new-api' into new-api

Author: eKoopmans

README.md

@@ -48,6 +48,14 @@ This worker has methods that can be chained sequentially, as each Promise resolv
 var worker = html2pdf().from(element).save();
 ```
 
+#### Workflow
+
+The basic workflow of html2pdf tasks (enforced by the prereq system) is:
+
+```
+.from() -> .toContainer() -> .toCanvas() -> .toImg() -> .toPdf() -> .save()
+```
+
 #### Worker API
 
 | Method       | Arguments          | Description |
@@ -56,7 +64,7 @@ var worker = html2pdf().from(element).save();
 | to           | target             | Converts the source to the specified target (`'container'`, `'canvas'`, `'img'`, or `'pdf'`). Each target also has its own `toX` method that can be called directly: `toContainer()`, `toCanvas()`, `toImg()`, and `toPdf()`. |
 | output       | type, options, src | Routes to the appropriate `outputPdf` or `outputImg` method based on specified `src` (`'pdf'` (default) or `'img'`). |
 | outputPdf    | type, options      | Sends `type` and `options` to the jsPDF object's `output` method, and returns the result as a Promise (use `.then` to access). See the [jsPDF source code](https://rawgit.com/MrRio/jsPDF/master/docs/jspdf.js.html#line992) for more info. |
-| outputImg    | type, options      | Returns the specified data type for the image as a Promise (use `.then` to access). Supported types: `'img'`, `'datauristring/dataurlstring'`, and `'datauri/dataurl'`. |
+| outputImg    | type, options      | Returns the specified data type for the image as a Promise (use `.then` to access). Supported types: `'img'`, `'datauristring'`/`'dataurlstring'`, and `'datauri'`/`'dataurl'`. |
 | save         | filename           | Saves the PDF object with the optional filename (creates user download prompt). |
 | set          | opt                | Sets the specified properties. See [Options](#options) below for more details. |
 | get          | key, cbk           | Returns the property specified in `key`, either as a Promise (use `.then` to access), or by calling `cbk` if provided. |

src/index.js

@@ -2,6 +2,7 @@ import 'es6-promise/auto';
 
 import Worker from './worker.js';
 import './plugin/jspdf-plugin.js';
+import './plugin/pagebreaks.js';
 import './plugin/hyperlinks.js';
 
 /**

src/plugin/pagebreaks.js

@@ -0,0 +1,18 @@
+import Worker from '../worker.js';
+
+var orig = {
+  toContainer: Worker.prototype.toContainer
+};
+
+Worker.prototype.toContainer = function toContainer() {
+  return orig.toContainer.call(this).then(function toContainer_pagebreak() {
+    // Enable page-breaks.
+    var pageBreaks = source.querySelectorAll('.html2pdf__page-break');
+    var pxPageHeight = this.prop.pageSize.inner.px.height;
+    Array.prototype.forEach.call(pageBreaks, function pageBreak_loop(el) {
+      el.style.display = 'block';
+      var clientRect = el.getBoundingClientRect();
+      el.style.height = pxPageHeight - (clientRect.top % pxPageHeight) + 'px';
+    }, this);
+  });
+};

src/worker.js

@@ -122,15 +122,6 @@ Worker.prototype.toContainer = function toContainer() {
     this.prop.container.appendChild(source);
     this.prop.overlay.appendChild(this.prop.container);
     document.body.appendChild(this.prop.overlay);
-
-    // Enable page-breaks.
-    var pageBreaks = source.querySelectorAll('.html2pdf__page-break');
-    var pxPageHeight = this.prop.pageSize.inner.px.height;
-    Array.prototype.forEach.call(pageBreaks, function pageBreak_loop(el) {
-      el.style.display = 'block';
-      var clientRect = el.getBoundingClientRect();
-      el.style.height = pxPageHeight - (clientRect.top % pxPageHeight) + 'px';
-    }, this);
   });
 };
 
@@ -437,7 +428,7 @@ Worker.prototype.thenCore = function thenCore(onFulfilled, onRejected, thenBase)
   if (onRejected)   { onRejected = onRejected.bind(self); }
 
   // Cast self into a Promise to avoid polyfills recursively defining `then`.
-  var selfPromise = (Promise.toString().indexOf('[native code]') === -1) ?
+  var selfPromise = (Promise.toString() !== 'function Promise() { [native code] }') ?
       Worker.convert(Object.assign({}, self), Promise.prototype) : self;
 
   // Return the promise, after casting it into a Worker and preserving props.