diff --git a/src/Clone.js b/src/Clone.js index 06da9d6..c77b722 100644 --- a/src/Clone.js +++ b/src/Clone.js @@ -18,11 +18,11 @@ export class DocumentCloner { inlineImages: boolean; copyStyles: boolean; - constructor(element: HTMLElement, options: Options, logger: Logger) { + constructor(element: HTMLElement, options: Options, logger: Logger, copyInline: boolean) { this.referenceElement = element; this.scrolledElements = []; - this.copyStyles = true; - this.inlineImages = true; + this.copyStyles = copyInline; + this.inlineImages = copyInline; this.logger = logger; this.imageLoader = new ImageLoader(options, logger, window); // $FlowFixMe @@ -237,7 +237,7 @@ export const cloneWindow = ( options: Options, logger: Logger ): Promise<[HTMLIFrameElement, HTMLElement]> => { - const cloner = new DocumentCloner(referenceElement, options, logger); + const cloner = new DocumentCloner(referenceElement, options, logger, false); const cloneIframeContainer = ownerDocument.createElement('iframe'); cloneIframeContainer.className = 'html2canvas-container'; diff --git a/src/ImageLoader.js b/src/ImageLoader.js index 371d35e..53e2ff7 100644 --- a/src/ImageLoader.js +++ b/src/ImageLoader.js @@ -38,7 +38,11 @@ export default class ImageLoader { return this.addImage(src, src); } } else { - if (this.options.allowTaint === true || isInlineBase64Image(src) || this.isSameOrigin(src)) { + if ( + this.options.allowTaint === true || + isInlineBase64Image(src) || + this.isSameOrigin(src) + ) { return this.addImage(src, src); } else if (typeof this.options.proxy === 'string' && !this.isSameOrigin(src)) { // TODO proxy diff --git a/src/index.js b/src/index.js index 38a1376..6a841b6 100644 --- a/src/index.js +++ b/src/index.js @@ -23,7 +23,7 @@ export type Options = { proxy: ?string, removeContainer: ?boolean, scale: number, - target: RenderTarget<*> | Array>, + target: RenderTarget<*>, type: ?string, windowWidth: number, windowHeight: number, @@ -98,7 +98,7 @@ const html2canvas = (element: HTMLElement, config: Options): Promise<*> => { scale: options.scale }); }); - })(new DocumentCloner(element, options, logger)) + })(new DocumentCloner(element, options, logger, true)) : cloneWindow( ownerDocument, windowBounds, diff --git a/tests/testrunner.js b/tests/testrunner.js index b436553..2fa3998 100644 --- a/tests/testrunner.js +++ b/tests/testrunner.js @@ -115,7 +115,7 @@ const assertPath = (result, expected, desc) => { .html2canvas(testContainer.contentWindow.document.documentElement, { removeContainer: true }) - .then((canvas) => { + .then(canvas => { try { canvas .getContext('2d')