chore(release): 1.0.0-rc.0

* https://github.com/niklasvh/html2canvas/issues/1374 - Wrap accesing the cssText property in a try...catch

.babelrc

@@ -1,4 +1,13 @@
 {
-    "plugins": ["transform-object-rest-spread"],
+    "presets": [[
-    "presets": ["es2015", "flow"]
+        "@babel/preset-env",
+        {
+            "targets": {
+                "ie": "9"
+            }
+        }
+    ], "@babel/preset-flow"],
+    "plugins": [
+        "add-module-exports"
+    ]
 }

.editorconfig

@@ -11,7 +11,7 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[{.travis.yml,package.json}]
+[{azure-pipelines.yml,package.json}]
 # The indent size used in the `package.json` file cannot be changed
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516
 indent_size = 2

.flowconfig

@@ -1,5 +1,6 @@
 [ignore]
 .*/www/.*
+.*/node_modules/@webassemblyjs/.*
 [include]
 [libs]
 ./flow-typed

.gitignore

@@ -1,4 +1,5 @@
 /dist
+/tmp
 /build
 /nbproject/
 image.jpg

.npmignore

@@ -5,6 +5,7 @@ scripts/
 src/
 tests/
 www/
+tmp/
 .github/
 *.iml
 .babelrc
@@ -13,6 +14,8 @@ www/
 .npmignore
 .eslintrc
 .travis.yml
+azure-pipelines.yml
 karma.js
 karma.conf.js
+rollup.config.js
 webpack.config.js

.travis.yml

@@ -1,57 +0,0 @@
-language: node_js
-node_js:
-- '7'
-env:
-  global:
-  - secure: eW41gIqOizwO4pTgWnAAbW75AP7F+CK9qfSed/fSh4sJ9HWMIY1YRIaY8gjr+6jV/f7XVHcXuym6ZxgINYSkVKbF1JKxBJNLOXtSgNbVHSic58pYFvUjwxIBI9aPig9uux1+DbnpWqXFDTcACJSevQZE0xwmjdrSkDLgB0G34v8=
-  - secure: Y2Av+Gd3z9uQEB36GwdOOuGka0hx0/HeitASEo59z934O8RxnmN9eNTXS7dDT3XtKtwxIyLTOEpS7qlRdWahH28hr/dS4xJj6ao58C+1xMcDs6NAPGmDxUlcJWpcGEsnjmXjQCc3fBioSTdpIBrK/gdvgpNh77UKG74Sk7Z+YGk=
-addons:
-  chrome: stable
-  firefox: latest
-dist: trusty
-sudo: false
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-notifications:
-  webhooks:
-    urls:
-    - https://webhooks.gitter.im/e/2b007d4f86de89588804
-    on_success: always
-    on_failure: always
-    on_start: false
-script:
-  - npm run build
-  - cd www && npm install && npm run build && cd ..
-  - npm test
-deploy:
-  - provider: npm
-    email: niklasvh@gmail.com
-    api_key:
-      secure: G/Szpr8q4/D6hp+H/Z9yyluUXtHAwf7LLa1Y07X59/Enlj1h7V5fQ7AW4/iAVM3XbIsrCPWR3dJU9g/ZxpxFg4OovIHVpS2Jr/mahtPYWdHR3pWuSmMW8QD+Twnq2VAFwSgg5Oumq3QxhX3YbCOnZox6+6Uviqk8FO7Z5B0RwW4=
-    skip_cleanup: true
-    on:
-      tags: true
-      branch: master
-      repo: niklasvh/html2canvas
-  - provider: releases
-    api_key:
-     secure: "PowO/Jat660k3gHcjgI6DlJz15RM7pLUu11UPsLCtYJ8ZwodppE6Keg0DfVkSFSIZttZor+UssDwP/WOEqfZNLqmXbcj3Gec4xolohet/GOe0KJKKuF/HgggbcxumopxMX6sMVePlMBpkLpHh7tgEAEHBWTlzC1c1a7Xa48fZ7k="
-    file:
-     - "dist/html2canvas.js"
-     - "dist/html2canvas.min.js"
-    skip_cleanup: true
-    on:
-      tags: true
-      branch: master
-      repo: niklasvh/html2canvas
-  - provider: pages
-    skip_cleanup: true
-    local_dir: www/public
-    target_branch: gh-pages
-    fqdn: html2canvas.hertzen.com
-    github_token:
-      secure: "PowO/Jat660k3gHcjgI6DlJz15RM7pLUu11UPsLCtYJ8ZwodppE6Keg0DfVkSFSIZttZor+UssDwP/WOEqfZNLqmXbcj3Gec4xolohet/GOe0KJKKuF/HgggbcxumopxMX6sMVePlMBpkLpHh7tgEAEHBWTlzC1c1a7Xa48fZ7k="
-    on:
-      branch: master
-      repo: niklasvh/html2canvas

CHANGELOG.md

@@ -1,47 +1,90 @@
-### Changelog ###
+# Change Log
 
-#### v1.0.0-alpha.8 - 2.1.2018 ####
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+# [1.0.0-rc.0](https://github.com/niklasvh/html2canvas/compare/v1.0.0-alpha.12...v1.0.0-rc.0) (2019-04-07)
+
+
+### build
+
+* update webpack and babel (#1793) ([44f3d79f68836624c2673a86f9ad47c17ef843c3](https://github.com/niklasvh/html2canvas/commit/44f3d79f68836624c2673a86f9ad47c17ef843c3)), closes [#1793](https://github.com/niklasvh/html2canvas/issues/1793)
+
+### ci
+
+* automate changelog generation (#1792) ([7ebef72e927eaafd34a1792ece431d2a73109230](https://github.com/niklasvh/html2canvas/commit/7ebef72e927eaafd34a1792ece431d2a73109230)), closes [#1792](https://github.com/niklasvh/html2canvas/issues/1792)
+* Improve CI pipeline (#1790) ([c45ef099fe8f7142e174f4fce39448a370a987d5](https://github.com/niklasvh/html2canvas/commit/c45ef099fe8f7142e174f4fce39448a370a987d5)), closes [#1790](https://github.com/niklasvh/html2canvas/issues/1790)
+
+### docs
+
+* improve canvas size limit documentation (#1576) ([3212184146b33c3564c2f416e1bfda911737c38b](https://github.com/niklasvh/html2canvas/commit/3212184146b33c3564c2f416e1bfda911737c38b)), closes [#1576](https://github.com/niklasvh/html2canvas/issues/1576)
+
+### fix
+
+* enforce colorstop min 0 (#1743) ([349bbf137abd83464e074db3948fc79a541c2ef3](https://github.com/niklasvh/html2canvas/commit/349bbf137abd83464e074db3948fc79a541c2ef3)), closes [#1743](https://github.com/niklasvh/html2canvas/issues/1743)
+* prevent unhandled promise rejections for hidden frames (#1762) ([5cbe5db35155e3a9790a30de09feb17843053b7a](https://github.com/niklasvh/html2canvas/commit/5cbe5db35155e3a9790a30de09feb17843053b7a)), closes [#1762](https://github.com/niklasvh/html2canvas/issues/1762)
+* wrap .sheet.cssRules access in try...catch. (#1693) ([2c018d19875ced30caafdc40f84ca531de6e6f91](https://github.com/niklasvh/html2canvas/commit/2c018d19875ced30caafdc40f84ca531de6e6f91)), closes [#1693](https://github.com/niklasvh/html2canvas/issues/1693)
+
+
+
+# [1.0.0-alpha.12](https://github.com/niklasvh/html2canvas/compare/v1.0.0-alpha.12...v1.0.0-alpha.13) (2019-04-07)
+ * Fix white space appearing on element rendering (Fix #1438)
+ * Reset canvas transform on finish (Fix #1494)
+
+# v1.0.0-alpha.11 - 1.4.2018 
+ * Fix IE11 member not found error 
+ * Support blob image resources in non-foreignObjectRendering mode
+
+# v1.0.0-alpha.10 - 15.2.2018 
+ * Re-introduce `onclone` option (Fix #1434)
+ * Add `ignoreElements` predicate function option
+ * Fix version console logging
+
+# v1.0.0-alpha.9 - 7.1.2018 
+ * Fix dynamic style sheets
+ * Fix > 50% border-radius values
+
+# v1.0.0-alpha.8 - 2.1.2018
  * Use correct doctype in cloned Document (Fix #1298)
  * Fix individual border rendering (Fix #1349)
 
-#### v1.0.0-alpha.7 - 31.12.2017 ####
+# v1.0.0-alpha.7 - 31.12.2017
  * Fix form input rendering (#1338)
  * Improve word line breaking algorithm
 
-#### v1.0.0-alpha.6 - 28.12.2017 ####
+# v1.0.0-alpha.6 - 28.12.2017 
  * Fix list-style: none (#1340)
  * Extend supported values for pseudo element content
 
-#### v1.0.0-alpha.5 - 21.12.2017 ####
+# v1.0.0-alpha.5 - 21.12.2017
  * Fix underline positioning
  * Fix canvas rendering on Chrome
  * Fix overflow: auto
  * Added support for rendering list-style
 
-#### v1.0.0-alpha.4 - 12.12.2017 ####
+ v1.0.0-alpha.4 - 12.12.2017 
  * Fix rendering with multiple fonts defined (Fix #796)
  * Add support for radial-gradients
  * Fix logging option (#1302)
  * Add support for rendering webgl canvas content (#646)
  * Fix external SVG loading with proxies (#802)
 
-#### v1.0.0-alpha.3 - 9.12.2017 ####
+# v1.0.0-alpha.3 - 9.12.2017
  * Disable `foreignObjectRendering` by default (#1295)
  * Fix background-size when using background-origin and background-size: cover/contain (#1299)
  * Added support for background-origin: content-box (#1299)
 
-#### v1.0.0-alpha.2 - 7.12.2017 ####
+# v1.0.0-alpha.2 - 7.12.2017
  * Fix scroll positions for CanvasRenderer (#1259)
  * Fix `data-html2canvas-ignore` attribute (#1253)
  * Fix decimal `letter-spacing` values (#1293)
 
-#### v1.0.0-alpha.1 - 5.12.2017 ####
+# v1.0.0-alpha.1 - 5.12.2017
  * Complete rewrite of library
  ##### Breaking Changes #####
  * Remove deprecated onrendered callback, calling `html2canvas` returns a `Promise<HTMLCanvasElement>`
  * Removed option `type`, same results can be achieved by assigning `x`, `y`, `scrollX`, `scrollY`, `width` and `height` properties.
  
- ##### New featues / fixes #####
+ ## New featues / fixes 
  * Add support for scaling canvas (defaults to device pixel ratio)
  * Add support for multiple text-shadows
  * Add support for multiple text-decorations
@@ -51,18 +94,18 @@
  * Correctly support all angle types for linear-gradients
  * Add support for multiple values for background-repeat, background-position and background-size
  
-#### v0.5.0-beta4 - 23.1.2016 ####
+# v0.5.0-beta4 - 23.1.2016
  * Fix logger requiring access to window object
  * Derequire browserify build
  * Fix rendering of specific elements when window is scrolled and `type` isn't set to `view`
 
-#### v0.5.0-beta3 - 6.12.2015 ####
+# v0.5.0-beta3 - 6.12.2015
  * Handle color names in linear gradients
 
-#### v0.5.0-beta2 - 20.10.2015 ####
+# v0.5.0-beta2 - 20.10.2015
  * Remove Promise polyfill (use native or provide it yourself)
 
-#### v0.5.0-beta1 - 19.10.2015 ####
+# v0.5.0-beta1 - 19.10.2015
  * Fix bug with unmatched color stops in gradients
  * Fix scrolling issues with iOS
  * Correctly handle named colors in gradients
@@ -70,11 +113,11 @@
  * Fix transparent colors breaking gradients
  * Preserve scrolling positions on render
 
-#### v0.5.0-alpha2 - 3.2.2015 ####
+# v0.5.0-alpha2 - 3.2.2015 
  * Switch to using browserify for building
  * Fix (#517) Chrome stretches background images with 'auto' or single attributes
 
-#### v0.5.0-alpha - 19.1.2015#### 
+# v0.5.0-alpha - 19.1.2015 
  * Complete rewrite of library
  * Switched interface to return Promise
  * Uses hidden iframe window to perform rendering, allowing async rendering and doesn't force the viewport to be scrolled to the top anymore.
@@ -85,14 +128,14 @@
  * Changed format for proxy requests, permitting binary responses with CORS headers as well
  * Fixed many layering issues (see z-index tests)
 
-#### v0.4.1 - 7.9.2013 ####
+# v0.4.1 - 7.9.2013 
  * Added support for bower
  * Improved z-index ordering
  * Basic implementation for CSS transformations
  * Fixed inline text in top element
  * Basic implementation for text-shadow
 
-#### v0.4.0 - 30.1.2013 ####
+# v0.4.0 - 30.1.2013 
  * Added rendering tests with <a href="https://github.com/niklasvh/webdriver.js">webdriver</a>
  * Switched to using grunt for building
  * Removed support for IE<9, including any FlashCanvas bits
@@ -102,7 +145,7 @@
  * Support for placeholder rendering
  * Reformatted all tests to small units to test specific features
 
-#### v0.3.4 - 26.6.2012 ####
+# v0.3.4 - 26.6.2012 
 
 * Removed (last?) jQuery dependencies (<a href="https://github.com/niklasvh/html2canvas/commit/343b86705fe163766fcf735eb0217130e4bd5b17">niklasvh</a>)
 * SVG-powered rendering (<a href="https://github.com/niklasvh/html2canvas/commit/67d3e0d0f59a5a654caf71a2e3be6494ff146c75">niklasvh</a>)
@@ -110,7 +153,7 @@
 * Split renderers to their own objects (<a href="https://github.com/niklasvh/html2canvas/commit/94f2f799a457cd29a21cc56ef8c06f1697866739">niklasvh</a>)
 * Simplified API, cleaned up code (<a href="https://github.com/niklasvh/html2canvas/commit/c7d526c9eaa6a4abf4754d205fe1dee360c7660e">niklasvh</a>)
 
-#### v0.3.3 - 2.3.2012 ####
+# v0.3.3 - 2.3.2012
 
 * SVG taint fix, and additional taint testing options for rendering (<a href="https://github.com/niklasvh/html2canvas/commit/2dc8b9385e656696cb019d615bdfa1d98b17d5d4">niklasvh</a>)
 * Added support for CORS images and option to create canvas as tainted (<a href="https://github.com/niklasvh/html2canvas/commit/3ad49efa0032cde25c6ed32a39e35d1505d3b2ef">niklasvh</a>)
@@ -118,7 +161,7 @@
 * Added integrated support for Flashcanvas (<a href="https://github.com/niklasvh/html2canvas/commit/e9257191519f67d74fd5e364d8dee3c0963ba5fc">niklasvh</a>)
 * Fixed a variety of legacy IE bugs (<a href="https://github.com/niklasvh/html2canvas/commit/b65357c55d0701017bafcd357bc654b54d458f8f">niklasvh</a>)
 
-#### v0.3.2 - 20.2.2012 ####
+# v0.3.2 - 20.2.2012
 
 * Added changelog!
 * Added bookmarklet (<a href="https://github.com/niklasvh/html2canvas/commit/b320dd306e1a2d32a3bc5a71b6ebf6d8c060cde5">cobexer</a>)

README.md

@@ -3,7 +3,10 @@ html2canvas
 
 [Homepage](https://html2canvas.hertzen.com) | [Downloads](https://github.com/niklasvh/html2canvas/releases) | [Questions](http://stackoverflow.com/questions/tagged/html2canvas?sort=newest) | [Donate](https://www.gittip.com/niklasvh/)
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/niklasvh/html2canvas?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://travis-ci.org/niklasvh/html2canvas.svg)](https://travis-ci.org/niklasvh/html2canvas)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/niklasvh/html2canvas?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) 
+[![Build Status](https://dev.azure.com/niklasvh/html2canvas/_apis/build/status/niklasvh.html2canvas?branchName=master)](https://dev.azure.com/niklasvh/html2canvas/_build/latest?definitionId=1&branchName=master)
+[![NPM Downloads](https://img.shields.io/npm/dm/html2canvas.svg)](https://www.npmjs.org/package/html2canvas)
+[![NPM Version](https://img.shields.io/npm/v/html2canvas.svg)](https://www.npmjs.org/package/html2canvas)
 
 #### JavaScript HTML renderer ####
 

azure-pipelines.yml

@@ -0,0 +1,313 @@
+trigger:
+- master
+
+jobs:
+  - job: Build
+    displayName: Build
+    pool:
+      vmImage: 'Ubuntu-16.04'
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - task: Npm@0
+      inputs:
+        command: install
+    - script: npm run build
+      displayName: Build
+    - script: |
+       npm pack
+       mv html2canvas-*.tgz html2canvas.tgz
+       tar --list --verbose --file=html2canvas.tgz
+      displayName: Pack
+      name: pack
+    - task: PublishBuildArtifacts@1
+      inputs:
+        PathtoPublish: html2canvas.tgz
+        artifactName: npm
+    - task: PublishBuildArtifacts@1
+      inputs:
+        PathtoPublish: 'dist'
+        artifactName: dist
+    - task: PublishBuildArtifacts@1
+      inputs:
+        PathtoPublish: 'build'
+        artifactName: build
+  - job: Test
+    displayName: Tests
+    pool:
+      vmImage: 'Ubuntu-16.04'
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - task: Npm@0
+      inputs:
+        command: install
+    - script: npm run build
+      displayName: Build
+    - script: npm run lint
+      displayName: Lint
+    - script: npm run flow
+      displayName: Flow
+    - script: npm run test:node
+      displayName: Unit tests
+  - job: Build_docs
+    displayName: Build docs
+    pool:
+      vmImage: 'Ubuntu-16.04'
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - task: Npm@0
+      inputs:
+        command: install
+    - script: npm run build && cd www && npm install && npm run build && cd ..
+      displayName: Build docs
+    - task: PublishBuildArtifacts@1
+      displayName: Upload docs website artifact
+      inputs:
+        PathtoPublish: 'www/public'
+        artifactName: docs
+  - job: Browser_Tests_Linux_Firefox_Stable
+    displayName: Linux Firefox Stable
+    pool:
+      vmImage: 'Ubuntu-16.04'
+    variables:
+      TARGET_BROWSER: Firefox_Stable
+    dependsOn: Build
+    condition: succeeded()
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - task: Npm@0
+      inputs:
+        command: install
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download library'
+      inputs:
+        artifactName: dist
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download testrunner'
+      inputs:
+        artifactName: build
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - script: Xvfb :99 &
+      displayName: 'Start Xvfb'
+    - script: DISPLAY=:99 npm run karma
+      displayName: 'Run Firefox tests - Firefox Stable'
+    - task: PublishTestResults@2
+      condition: succeededOrFailed()
+      inputs:
+        testRunner: JUnit
+        testResultsFiles: 'tmp/junit/*.xml'
+    - task: PublishBuildArtifacts@1
+      displayName: Upload Screenshots
+      condition: succeededOrFailed()
+      inputs:
+        PathtoPublish: 'tmp/reftests'
+        artifactName: ReftestResults
+  - job: Browser_Tests_Linux_Chrome_Stable
+    displayName: Linux Chrome Stable
+    pool:
+      vmImage: 'Ubuntu-16.04'
+    variables:
+      TARGET_BROWSER: Chrome_Stable
+    dependsOn: Build
+    condition: succeeded()
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - task: Npm@0
+      inputs:
+        command: install
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download library'
+      inputs:
+        artifactName: dist
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download testrunner'
+      inputs:
+        artifactName: build
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - script: Xvfb :99 &
+      displayName: 'Start Xvfb'
+    - script: DISPLAY=:99 npm run karma
+      displayName: 'Run Chrome tests - Chrome Stable'
+    - task: PublishTestResults@2
+      condition: succeededOrFailed()
+      inputs:
+        testRunner: JUnit
+        testResultsFiles: 'tmp/junit/*.xml'
+    - task: PublishBuildArtifacts@1
+      displayName: Upload Screenshots
+      condition: succeededOrFailed()
+      inputs:
+        PathtoPublish: 'tmp/reftests'
+        artifactName: ReftestResults
+  - job: Browser_Tests_OSX_Safari_Stable
+    displayName: OSX Safari Stable
+    pool:
+      vmImage: 'macOS-10.13'
+    variables:
+      TARGET_BROWSER: Safari_Stable
+    dependsOn: Build
+    condition: succeeded()
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - task: Npm@0
+      inputs:
+        command: install
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download library'
+      inputs:
+        artifactName: dist
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download testrunner'
+      inputs:
+        artifactName: build
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - script: npm run karma
+      displayName: 'Run Safari tests - Safari Stable'
+    - task: PublishTestResults@2
+      condition: succeededOrFailed()
+      inputs:
+        testRunner: JUnit
+        testResultsFiles: 'tmp/junit/*.xml'
+    - task: PublishBuildArtifacts@1
+      displayName: Upload Screenshots
+      condition: succeededOrFailed()
+      inputs:
+        PathtoPublish: 'tmp/reftests'
+        artifactName: ReftestResults
+  - job: Browser_Tests_Windows_IE9
+    displayName: Windows Internet Explorer 9 (Emulated)
+    pool:
+      vmImage: 'vs2017-win2016'
+    variables:
+      TARGET_BROWSER: IE_9
+    dependsOn: Build
+    condition: succeeded()
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - task: Npm@0
+      inputs:
+        command: install
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download library'
+      inputs:
+        artifactName: dist
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download testrunner'
+      inputs:
+        artifactName: build
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - script: npm run karma
+      displayName: 'Run Internet Explorer tests - IE 9'
+    - task: PublishTestResults@2
+      condition: succeededOrFailed()
+      inputs:
+        testRunner: JUnit
+        testResultsFiles: 'tmp/junit/*.xml'
+    - task: PublishBuildArtifacts@1
+      displayName: Upload Screenshots
+      condition: succeededOrFailed()
+      inputs:
+        PathtoPublish: 'tmp/reftests'
+        artifactName: ReftestResults
+  - job: Browser_Tests_Windows_IE10
+    displayName: Windows Internet Explorer 10 (Emulated)
+    pool:
+      vmImage: 'vs2017-win2016'
+    variables:
+      TARGET_BROWSER: IE_10
+    dependsOn: Build
+    condition: succeeded()
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - task: Npm@0
+      inputs:
+        command: install
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download library'
+      inputs:
+        artifactName: dist
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download testrunner'
+      inputs:
+        artifactName: build
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - script: npm run karma
+      displayName: 'Run Internet Explorer tests - IE 10'
+    - task: PublishTestResults@2
+      condition: succeededOrFailed()
+      inputs:
+        testRunner: JUnit
+        testResultsFiles: 'tmp/junit/*.xml'
+    - task: PublishBuildArtifacts@1
+      displayName: Upload Screenshots
+      condition: succeededOrFailed()
+      inputs:
+        PathtoPublish: 'tmp/reftests'
+        artifactName: ReftestResults
+  - job: Browser_Tests_Windows_IE11
+    displayName: Windows Internet Explorer 11
+    pool:
+      vmImage: 'vs2017-win2016'
+    variables:
+      TARGET_BROWSER: IE_11
+    dependsOn: Build
+    condition: succeeded()
+    steps:
+    - task: NodeTool@0
+      inputs:
+        versionSpec: '10.x'
+      displayName: 'Install Node.js'
+    - task: Npm@0
+      inputs:
+        command: install
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download library'
+      inputs:
+        artifactName: dist
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download testrunner'
+      inputs:
+        artifactName: build
+        downloadPath: $(System.DefaultWorkingDirectory)
+    - script: npm run karma
+      displayName: 'Run Internet Explorer tests - IE 11'
+    - task: PublishTestResults@2
+      condition: succeededOrFailed()
+      inputs:
+        testRunner: JUnit
+        testResultsFiles: 'tmp/junit/*.xml'
+    - task: PublishBuildArtifacts@1
+      displayName: Upload Screenshots
+      condition: succeededOrFailed()
+      inputs:
+        PathtoPublish: 'tmp/reftests'
+        artifactName: ReftestResults

docs/configuration.md

@@ -1,5 +1,5 @@
 ---
-title: "Configuration"
+title: "Options"
 description: "Explore the different configuration options available for html2canvas"
 previousUrl: "/getting-started"
 previousTitle: "Getting Started"
@@ -17,7 +17,9 @@ These are all of the available configuration options.
 | canvas | `null` | Existing `canvas` element to use as a base for drawing on
 | foreignObjectRendering | `false` | Whether to use ForeignObject rendering if the browser supports it
 | imageTimeout | `15000` | Timeout for loading an image (in milliseconds). Set to `0` to disable timeout.
+| ignoreElements | `(element) => false` | Predicate function which removes the matching elements from the render.
 | logging | `true` | Enable logging for debug purposes
+| onclone | `null` | Callback function which is called when the Document has been cloned for rendering, can be used to modify the contents that will be rendered without affecting the original source document.
 | proxy | `null` | Url to the [proxy](/proxy/) which is to be used for loading cross-origin images. If left empty, cross-origin images won't be loaded.
 | removeContainer | `true` | Whether to cleanup the cloned DOM elements html2canvas creates temporarily
 | scale | `window.devicePixelRatio` | The scale to use for rendering. Defaults to the browsers device pixel ratio.

docs/faq.md

@@ -13,8 +13,14 @@ methods to check whether an image would taint the canvas before applying it. If
 If you wish to load images that reside outside of your pages origin, you can use a [proxy](/proxy) to load the images.
 
 ## Why is the produced canvas empty or cuts off half way through?
-Make sure that `canvas` element doesn't hit [browser limitations](https://stackoverflow.com/questions/6081483/maximum-size-of-a-canvas-element) for the `canvas` size. 
+Make sure that `canvas` element doesn't hit [browser limitations](https://stackoverflow.com/questions/6081483/maximum-size-of-a-canvas-element) for the `canvas` size or use the window configuration options to set a custom window size based on the `canvas` element:
-The limitations vary by browser, operating system and system hardware.
+```
+await html2canvas(element, {
+    windowWidth: element.scrollWidth,
+    windowHeight: element.scrollHeight
+});
+```
+The window limitations vary by browser, operating system and system hardware.
 
 ### Chrome
 > Maximum height/width: 32,767 pixels

karma.conf.js

@@ -1,89 +1,101 @@
 // Karma configuration
 // Generated on Sat Aug 05 2017 23:42:26 GMT+0800 (Malay Peninsula Standard Time)
 
+const path = require('path');
 const port = 9876;
 module.exports = function(config) {
-    const slLaunchers = (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) ? {} : {
+    const launchers = {
-        sl_beta_chrome: {
+        SauceLabs_IE9: {
-            base: 'SauceLabs',
-            browserName: 'chrome',
-            platform: 'Windows 10',
-            version: 'beta'
-        },
-        sl_ie9: {
             base: 'SauceLabs',
             browserName: 'internet explorer',
             version: '9.0',
             platform: 'Windows 7'
         },
-        sl_ie10: {
+        SauceLabs_IE10: {
             base: 'SauceLabs',
             browserName: 'internet explorer',
             version: '10.0',
             platform: 'Windows 7'
         },
-        sl_ie11: {
+        SauceLabs_IE11: {
             base: 'SauceLabs',
             browserName: 'internet explorer',
             version: '11.0',
             platform: 'Windows 7'
         },
-        sl_edge_15: {
+        SauceLabs_Edge18: {
             base: 'SauceLabs',
             browserName: 'MicrosoftEdge',
-            version: '15.15063',
+            version: '18.17763',
             platform: 'Windows 10'
         },
-        sl_edge_14: {
+        SauceLabs_Android4: {
-            base: 'SauceLabs',
-            browserName: 'MicrosoftEdge',
-            version: '14.14393',
-            platform: 'Windows 10'
-        },
-        sl_safari: {
-            base: 'SauceLabs',
-            browserName: 'safari',
-            version: '10.1',
-            platform: 'macOS 10.12'
-        },
-        'sl_android_4.4': {
             base: 'SauceLabs',
             browserName: 'Browser',
             platform: 'Android',
             version: '4.4',
             device: 'Android Emulator',
         },
-        'sl_ios_10.3_safari': {
+        SauceLabs_iOS10_3: {
             base: 'SauceLabs',
             browserName: 'Safari',
             platform: 'iOS',
             version: '10.3',
             device: 'iPhone 7 Plus Simulator'
         },
-        'sl_ios_9.3_safari': {
+        SauceLabs_iOS9_3: {
             base: 'SauceLabs',
             browserName: 'Safari',
             platform: 'iOS',
             version: '9.3',
             device: 'iPhone 6 Plus Simulator'
         },
-        'sl_ios_8.4_safari': {
+        IE_9: {
-            base: 'SauceLabs',
+            base: 'IE',
-            browserName: 'Safari',
+            'x-ua-compatible': 'IE=EmulateIE9',
-            platform: 'iOS',
+            flags: ['-extoff']
-            version: '8.4',
+        },
-            device: 'iPhone 5s Simulator'
+        IE_10: {
+            base: 'IE',
+            'x-ua-compatible': 'IE=EmulateIE10',
+            flags: ['-extoff']
+        },
+        IE_11: {
+            base: 'IE',
+            flags: ['-extoff']
+        },
+        Safari_Stable: {
+            base: 'Safari'
+        },
+        Chrome_Stable: {
+            base: 'Chrome'
+        },
+        Firefox_Stable: {
+            base: 'Firefox'
         }
     };
 
-    const customLaunchers = Object.assign({}, slLaunchers, {
+    const ciLauncher = launchers[process.env.TARGET_BROWSER];
+
+    const customLaunchers = ciLauncher ? {target_browser: ciLauncher} : {
         stable_chrome: {
             base: 'Chrome'
         },
         stable_firefox: {
             base: 'Firefox'
         }
-    });
+    };
+
+    const injectTypedArrayPolyfills = function(files) {
+        files.unshift({
+            pattern: path.resolve(__dirname, './node_modules/js-polyfills/typedarray.js'),
+            included: true,
+            served: true,
+            watched: false
+        });
+    };
+
+    injectTypedArrayPolyfills.$inject = ['config.files'];
 
     config.set({
 
@@ -93,17 +105,22 @@ module.exports = function(config) {
 
         // frameworks to use
         // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-        frameworks: ['mocha'],
+        frameworks: ['mocha', 'inline-mocha-fix'],
-
 
         // list of files / patterns to load in the browser
         files: [
             'build/testrunner.js',
             { pattern: './tests/**/*', 'watched': true, 'included': false, 'served': true},
             { pattern: './dist/**/*', 'watched': true, 'included': false, 'served': true},
-            { pattern: './node_modules/**/*', 'watched': true, 'included': false, 'served': true}
+            { pattern: './node_modules/**/*', 'watched': true, 'included': false, 'served': true},
         ],
 
+        plugins: [
+            'karma-*',
+            {
+                'framework:inline-mocha-fix': ['factory', injectTypedArrayPolyfills]
+            }
+        ],
 
         // list of files to exclude
         exclude: [
@@ -119,7 +136,11 @@ module.exports = function(config) {
         // test results reporter to use
         // possible values: 'dots', 'progress'
         // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['progress', 'saucelabs'],
+        reporters: ['dots', 'junit'],
+
+        junitReporter: {
+            outputDir: 'tmp/junit/'
+        },
 
         // web server port
         port,

karma.js

@@ -14,6 +14,12 @@ const bodyParser = require('body-parser');
 const cors = require('cors');
 const filenamifyUrl = require('filenamify-url');
 
+const mkdirp = require('mkdirp');
+const screenshotFolder = './tmp/reftests';
+
+mkdirp.sync(path.resolve(__dirname, screenshotFolder));
+
+
 const CORS_PORT = 8081;
 const corsApp = express();
 corsApp.use('/proxy', proxy());
@@ -59,9 +65,9 @@ const writeScreenshot = (buffer, body) => {
     const filename = `${filenamifyUrl(
         body.test.replace(/^\/tests\/reftests\//, '').replace(/\.html$/, ''),
         {replacement: '-'}
-    )}!${body.platform.name}-${body.platform.version}.png`;
+    )}!${[process.env.TARGET_BROWSER, body.platform.name, body.platform.version].join('-')}.png`;
 
-    fs.writeFileSync(path.resolve(__dirname, './tests/results/', filename), buffer);
+    fs.writeFileSync(path.resolve(__dirname, screenshotFolder, filename), buffer);
 };
 
 app.post('/screenshot', (req, res) => {

package.json

@@ -3,7 +3,9 @@
   "name": "html2canvas",
   "description": "Screenshots with JavaScript",
   "main": "dist/npm/index.js",
-  "version": "1.0.0-alpha.8",
+  "module": "dist/html2canvas.js",
+  "browser": "dist/html2canvas.js",
+  "version": "1.0.0-rc.0",
   "author": {
     "name": "Niklas von Hertzen",
     "email": "niklasvh@gmail.com",
@@ -20,52 +22,58 @@
     "url": "https://github.com/niklasvh/html2canvas/issues"
   },
   "devDependencies": {
-    "babel-cli": "6.24.1",
+    "@babel/cli": "^7.4.3",
-    "babel-core": "6.25.0",
+    "@babel/core": "^7.4.3",
-    "babel-eslint": "7.2.3",
+    "@babel/preset-env": "^7.4.3",
-    "babel-loader": "7.1.1",
+    "@babel/preset-flow": "^7.0.0",
-    "babel-plugin-dev-expression": "0.2.1",
+    "babel-eslint": "^10.0.1",
-    "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+    "babel-loader": "^8.0.5",
-    "babel-plugin-transform-object-rest-spread": "6.23.0",
+    "babel-plugin-add-module-exports": "^1.0.0",
-    "babel-preset-es2015": "6.24.1",
+    "babel-plugin-dev-expression": "^0.2.1",
-    "babel-preset-flow": "6.23.0",
     "base64-arraybuffer": "0.1.5",
-    "body-parser": "1.17.2",
+    "body-parser": "^1.18.3",
     "chai": "4.1.1",
-    "chromeless": "1.2.0",
+    "chromeless": "^1.5.2",
     "cors": "2.8.4",
-    "eslint": "4.2.0",
+    "eslint": "^5.16.0",
     "eslint-plugin-flowtype": "2.35.0",
     "eslint-plugin-prettier": "2.1.2",
-    "express": "4.15.4",
+    "express": "^4.16.4",
     "filenamify-url": "1.0.0",
     "flow-bin": "0.56.0",
     "glob": "7.1.2",
-    "html2canvas-proxy": "1.0.0",
+    "html2canvas-proxy": "1.0.1",
     "jquery": "3.2.1",
-    "karma": "1.7.0",
+    "js-polyfills": "^0.1.42",
-    "karma-chrome-launcher": "2.2.0",
+    "karma": "^4.0.1",
-    "karma-edge-launcher": "0.4.1",
+    "karma-chrome-launcher": "^2.2.0",
-    "karma-firefox-launcher": "1.0.1",
+    "karma-edge-launcher": "^0.4.2",
-    "karma-ie-launcher": "1.0.0",
+    "karma-firefox-launcher": "^1.1.0",
-    "karma-mocha": "1.3.0",
+    "karma-ie-launcher": "^1.0.0",
-    "karma-sauce-launcher": "1.1.0",
+    "karma-junit-reporter": "^1.2.0",
-    "mocha": "3.5.0",
+    "karma-mocha": "^1.3.0",
+    "karma-safari-launcher": "^1.0.0",
+    "karma-sauce-launcher": "^2.0.2",
+    "mocha": "^6.1.0",
     "platform": "1.3.4",
     "prettier": "1.5.3",
     "promise-polyfill": "6.0.2",
     "replace-in-file": "^3.0.0",
     "rimraf": "2.6.1",
-    "serve-index": "1.9.0",
+    "serve-index": "^1.9.1",
     "slash": "1.0.0",
+    "standard-version": "^5.0.2",
     "uglifyjs-webpack-plugin": "^1.1.2",
-    "webpack": "3.4.1"
+    "webpack": "^4.29.6",
+    "webpack-cli": "^3.3.0"
   },
   "scripts": {
     "build": "rimraf dist/ && node scripts/create-reftest-list && npm run build:npm && npm run build:browser",
-    "build:npm": "babel src/ -d dist/npm/ --plugins=dev-expression,transform-es2015-modules-commonjs && replace-in-file __VERSION__ '\"$npm_package_version\"' dist/npm/index.js",
+    "build:npm": "babel src/ -d dist/npm/ --plugins=dev-expression && replace-in-file __VERSION__ '\"$npm_package_version\"' dist/npm/index.js",
     "build:browser": "webpack",
-    "format": "prettier --single-quote --no-bracket-spacing --tab-width 4 --print-width 100 --write \"{src,www,tests,scripts}/**/*.js\"",
+    "release": "standard-version",
+    "rollup": "rollup -c",
+    "format": "prettier --single-quote --no-bracket-spacing --tab-width 4 --print-width 100 --write \"{src,www/src,tests,scripts}/**/*.js\"",
     "flow": "flow",
     "lint": "eslint src/**",
     "test": "npm run flow && npm run lint && npm run test:node && npm run karma",

rollup.config.js

@@ -0,0 +1,37 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const pkg = JSON.parse(fs.readFileSync(path.resolve(__dirname, 'package.json')));
+
+const banner =
+    `/*
+${pkg.title} ${pkg.version} <${pkg.homepage}>
+Copyright (c) ${(new Date()).getFullYear()} ${pkg.author.name} <${pkg.author.url}>
+Released under ${pkg.license} License
+*/`;
+
+import babel from 'rollup-plugin-babel';
+import commonjs from 'rollup-plugin-commonjs';
+import resolve from 'rollup-plugin-node-resolve';
+
+export default {
+    input: './src/index.js',
+    plugins: [
+        resolve(),
+        babel({
+            exclude: 'node_modules/**'
+        }),
+        commonjs({
+            namedExports: {
+                'node_modules/css-line-break/dist/index.js': ['toCodePoints', 'fromCodePoint', 'LineBreaker']
+            }
+        })
+    ],
+    output: {
+        file: './dist/html2canvas.js',
+        name: 'html2canvas',
+        format: 'umd',
+        banner
+    }
+};

scripts/create-reftest-list.js

@@ -10,7 +10,7 @@ const outputPath = 'tests/reftests.js';
 const ignoredTests = fs
     .readFileSync(path.resolve(__dirname, `../tests/reftests/ignore.txt`))
     .toString()
-    .split('\n')
+    .split(/\r\n|\r|\n/)
     .filter(l => l.length)
     .reduce((acc, l) => {
         const m = l.match(/^(\[(.+)\])?(.+)$/i);

src/Bounds.js

@@ -202,40 +202,32 @@ export const parseBoundCurves = (
     borders: Array<Border>,
     borderRadius: Array<BorderRadius>
 ): BoundCurves => {
-    const HALF_WIDTH = bounds.width / 2;
+    let tlh = borderRadius[CORNER.TOP_LEFT][H].getAbsoluteValue(bounds.width);
-    const HALF_HEIGHT = bounds.height / 2;
+    let tlv = borderRadius[CORNER.TOP_LEFT][V].getAbsoluteValue(bounds.height);
-    const tlh =
+    let trh = borderRadius[CORNER.TOP_RIGHT][H].getAbsoluteValue(bounds.width);
-        borderRadius[CORNER.TOP_LEFT][H].getAbsoluteValue(bounds.width) < HALF_WIDTH
+    let trv = borderRadius[CORNER.TOP_RIGHT][V].getAbsoluteValue(bounds.height);
-            ? borderRadius[CORNER.TOP_LEFT][H].getAbsoluteValue(bounds.width)
+    let brh = borderRadius[CORNER.BOTTOM_RIGHT][H].getAbsoluteValue(bounds.width);
-            : HALF_WIDTH;
+    let brv = borderRadius[CORNER.BOTTOM_RIGHT][V].getAbsoluteValue(bounds.height);
-    const tlv =
+    let blh = borderRadius[CORNER.BOTTOM_LEFT][H].getAbsoluteValue(bounds.width);
-        borderRadius[CORNER.TOP_LEFT][V].getAbsoluteValue(bounds.height) < HALF_HEIGHT
+    let blv = borderRadius[CORNER.BOTTOM_LEFT][V].getAbsoluteValue(bounds.height);
-            ? borderRadius[CORNER.TOP_LEFT][V].getAbsoluteValue(bounds.height)
+
-            : HALF_HEIGHT;
+    const factors = [];
-    const trh =
+    factors.push((tlh + trh) / bounds.width);
-        borderRadius[CORNER.TOP_RIGHT][H].getAbsoluteValue(bounds.width) < HALF_WIDTH
+    factors.push((blh + brh) / bounds.width);
-            ? borderRadius[CORNER.TOP_RIGHT][H].getAbsoluteValue(bounds.width)
+    factors.push((tlv + blv) / bounds.height);
-            : HALF_WIDTH;
+    factors.push((trv + brv) / bounds.height);
-    const trv =
+    const maxFactor = Math.max(...factors);
-        borderRadius[CORNER.TOP_RIGHT][V].getAbsoluteValue(bounds.height) < HALF_HEIGHT
+
-            ? borderRadius[CORNER.TOP_RIGHT][V].getAbsoluteValue(bounds.height)
+    if (maxFactor > 1) {
-            : HALF_HEIGHT;
+        tlh /= maxFactor;
-    const brh =
+        tlv /= maxFactor;
-        borderRadius[CORNER.BOTTOM_RIGHT][H].getAbsoluteValue(bounds.width) < HALF_WIDTH
+        trh /= maxFactor;
-            ? borderRadius[CORNER.BOTTOM_RIGHT][H].getAbsoluteValue(bounds.width)
+        trv /= maxFactor;
-            : HALF_WIDTH;
+        brh /= maxFactor;
-    const brv =
+        brv /= maxFactor;
-        borderRadius[CORNER.BOTTOM_RIGHT][V].getAbsoluteValue(bounds.height) < HALF_HEIGHT
+        blh /= maxFactor;
-            ? borderRadius[CORNER.BOTTOM_RIGHT][V].getAbsoluteValue(bounds.height)
+        blv /= maxFactor;
-            : HALF_HEIGHT;
+    }
-    const blh =
-        borderRadius[CORNER.BOTTOM_LEFT][H].getAbsoluteValue(bounds.width) < HALF_WIDTH
-            ? borderRadius[CORNER.BOTTOM_LEFT][H].getAbsoluteValue(bounds.width)
-            : HALF_WIDTH;
-    const blv =
-        borderRadius[CORNER.BOTTOM_LEFT][V].getAbsoluteValue(bounds.height) < HALF_HEIGHT
-            ? borderRadius[CORNER.BOTTOM_LEFT][V].getAbsoluteValue(bounds.height)
-            : HALF_HEIGHT;
 
     const topWidth = bounds.width - trh;
     const rightHeight = bounds.height - brv;

src/Clone.js

@@ -213,7 +213,12 @@ export class DocumentCloner {
                         new Promise((resolve, reject) => {
                             const iframeCanvas = document.createElement('img');
                             iframeCanvas.onload = () => resolve(canvas);
-                            iframeCanvas.onerror = reject;
+                            iframeCanvas.onerror = function(event) {
+                                // Empty iframes may result in empty "data:," URLs, which are invalid from the <img>'s point of view
+                                // and instead of `onload` cause `onerror` and unhandled rejection warnings
+                                // https://github.com/niklasvh/html2canvas/issues/1502
+                                iframeCanvas.src == 'data:,' ? resolve(canvas) : reject(event);
+                            };
                             iframeCanvas.src = canvas.toDataURL();
                             if (tempIframe.parentNode) {
                                 tempIframe.parentNode.replaceChild(
@@ -229,6 +234,27 @@ export class DocumentCloner {
             return tempIframe;
         }
 
+        try {
+            if (node instanceof HTMLStyleElement && node.sheet && node.sheet.cssRules) {
+                const css = [].slice.call(node.sheet.cssRules, 0).reduce((css, rule) => {
+                    if (rule && rule.cssText) {
+                        return css + rule.cssText;
+                    }
+                    return css;
+                }, '');
+                const style = node.cloneNode(false);
+                style.textContent = css;
+                return style;
+            }
+        } catch (e) {
+            // accessing node.sheet.cssRules throws a DOMException
+            this.logger.log('Unable to access cssRules property');
+            if (e.name !== 'SecurityError') {
+                this.logger.log(e);
+                throw e;
+            }
+        }
+
         return node.cloneNode(false);
     }
 
@@ -259,8 +285,12 @@ export class DocumentCloner {
         for (let child = node.firstChild; child; child = child.nextSibling) {
             if (
                 child.nodeType !== Node.ELEMENT_NODE ||
-                // $FlowFixMe
+                (child.nodeName !== 'SCRIPT' &&
-                (child.nodeName !== 'SCRIPT' && !child.hasAttribute(IGNORE_ATTRIBUTE))
+                    // $FlowFixMe
+                    !child.hasAttribute(IGNORE_ATTRIBUTE) &&
+                    (typeof this.options.ignoreElements !== 'function' ||
+                        // $FlowFixMe
+                        !this.options.ignoreElements(child)))
             ) {
                 if (!this.copyStyles || child.nodeName !== 'STYLE') {
                     clone.appendChild(this.cloneNode(child));
@@ -598,14 +628,21 @@ export const cloneWindow = (
                 documentClone.documentElement.style.left = -bounds.left + 'px';
                 documentClone.documentElement.style.position = 'absolute';
             }
+
+            const result = Promise.resolve([
+                cloneIframeContainer,
+                cloner.clonedReferenceElement,
+                cloner.resourceLoader
+            ]);
+
+            const onclone = options.onclone;
+
             return cloner.clonedReferenceElement instanceof cloneWindow.HTMLElement ||
             cloner.clonedReferenceElement instanceof ownerDocument.defaultView.HTMLElement ||
             cloner.clonedReferenceElement instanceof HTMLElement
-                ? Promise.resolve([
+                ? typeof onclone === 'function'
-                      cloneIframeContainer,
+                  ? Promise.resolve().then(() => onclone(documentClone)).then(() => result)
-                      cloner.clonedReferenceElement,
+                  : result
-                      cloner.resourceLoader
-                  ])
                 : Promise.reject(
                       __DEV__
                           ? `Error finding the ${referenceElement.nodeName} in the cloned document`

src/Length.js

@@ -1,7 +1,7 @@
 /* @flow */
 'use strict';
 
-import NodeContainer from './NodeContainer';
+import type NodeContainer from './NodeContainer';
 
 const LENGTH_WITH_UNIT = /([\d.]+)(px|r?em|%)/i;
 

src/ListItem.js

@@ -488,7 +488,7 @@ const createCJKCounter = (
 const CHINESE_INFORMAL_MULTIPLIERS = '十百千萬';
 const CHINESE_FORMAL_MULTIPLIERS = '拾佰仟萬';
 const JAPANESE_NEGATIVE = 'マイナス';
-const KOREAN_NEGATIVE = '마이너스 ';
+const KOREAN_NEGATIVE = '마이너스';
 
 export const createCounterText = (
     value: number,

src/Logger.js

@@ -7,7 +7,7 @@ export default class Logger {
     id: ?string;
 
     constructor(enabled: boolean, id: ?string, start: ?number) {
-        this.enabled = enabled;
+        this.enabled = typeof window !== 'undefined' && enabled;
         this.start = start ? start : Date.now();
         this.id = id;
     }

src/ResourceLoader.js

@@ -33,6 +33,10 @@ export default class ResourceLoader {
         if (this.hasResourceInCache(src)) {
             return src;
         }
+        if (isBlobImage(src)) {
+            this.cache[src] = loadImage(src, this.options.imageTimeout || 0);
+            return src;
+        }
 
         if (!isSVG(src) || FEATURES.SUPPORT_SVG_DRAWING) {
             if (this.options.allowTaint === true || isInlineImage(src) || this.isSameOrigin(src)) {
@@ -215,6 +219,7 @@ const INLINE_IMG = /^data:image\/.*/i;
 
 const isInlineImage = (src: string): boolean => INLINE_IMG.test(src);
 const isInlineBase64Image = (src: string): boolean => INLINE_BASE64.test(src);
+const isBlobImage = (src: string): boolean => src.substr(0, 4) === 'blob';
 
 const isSVG = (src: string): boolean =>
     src.substr(-3).toLowerCase() === 'svg' || INLINE_SVG.test(src);

src/Unicode.js

@@ -1,7 +1,7 @@
 /* @flow */
 'use strict';
 
-import NodeContainer from './NodeContainer';
+import type NodeContainer from './NodeContainer';
 import {LineBreaker, fromCodePoint, toCodePoints} from 'css-line-break';
 import {OVERFLOW_WRAP} from './parsing/overflowWrap';
 

src/Window.js

@@ -14,6 +14,7 @@ import {Bounds} from './Bounds';
 import {cloneWindow, DocumentCloner} from './Clone';
 import {FontMetrics} from './Font';
 import Color, {TRANSPARENT} from './Color';
+import {parseBounds, parseDocumentSize} from './Bounds';
 
 export const renderElement = (
     element: HTMLElement,
@@ -62,14 +63,32 @@ export const renderElement = (
                           .then(() => cloner.resourceLoader.ready())
                           .then(() => {
                               const renderer = new ForeignObjectRenderer(cloner.documentElement);
+
+                              const defaultView = ownerDocument.defaultView;
+                              const scrollX = defaultView.pageXOffset;
+                              const scrollY = defaultView.pageYOffset;
+
+                              const isDocument =
+                                  element.tagName === 'HTML' || element.tagName === 'BODY';
+
+                              const {width, height, left, top} = isDocument
+                                  ? parseDocumentSize(ownerDocument)
+                                  : parseBounds(element, scrollX, scrollY);
+
                               return renderer.render({
                                   backgroundColor,
                                   logger,
                                   scale: options.scale,
-                                  x: options.x,
+                                  x: typeof options.x === 'number' ? options.x : left,
-                                  y: options.y,
+                                  y: typeof options.y === 'number' ? options.y : top,
-                                  width: options.width,
+                                  width:
-                                  height: options.height,
+                                      typeof options.width === 'number'
+                                          ? options.width
+                                          : Math.ceil(width),
+                                  height:
+                                      typeof options.height === 'number'
+                                          ? options.height
+                                          : Math.ceil(height),
                                   windowWidth: options.windowWidth,
                                   windowHeight: options.windowHeight,
                                   scrollX: options.scrollX,
@@ -102,16 +121,33 @@ export const renderElement = (
                               logger.log(`Starting renderer`);
                           }
 
+                          const defaultView = clonedDocument.defaultView;
+                          const scrollX = defaultView.pageXOffset;
+                          const scrollY = defaultView.pageYOffset;
+
+                          const isDocument =
+                              clonedElement.tagName === 'HTML' || clonedElement.tagName === 'BODY';
+
+                          const {width, height, left, top} = isDocument
+                              ? parseDocumentSize(ownerDocument)
+                              : parseBounds(clonedElement, scrollX, scrollY);
+
                           const renderOptions = {
                               backgroundColor,
                               fontMetrics,
                               imageStore,
                               logger,
                               scale: options.scale,
-                              x: options.x,
+                              x: typeof options.x === 'number' ? options.x : left,
-                              y: options.y,
+                              y: typeof options.y === 'number' ? options.y : top,
-                              width: options.width,
+                              width:
-                              height: options.height
+                                  typeof options.width === 'number'
+                                      ? options.width
+                                      : Math.ceil(width),
+                              height:
+                                  typeof options.height === 'number'
+                                      ? options.height
+                                      : Math.ceil(height)
                           };
 
                           if (Array.isArray(options.target)) {

src/index.js

@@ -6,7 +6,6 @@ import type {RenderTarget} from './Renderer';
 import CanvasRenderer from './renderer/CanvasRenderer';
 import Logger from './Logger';
 import {renderElement} from './Window';
-import {parseBounds, parseDocumentSize} from './Bounds';
 
 export type Options = {
     async: ?boolean,
@@ -14,8 +13,10 @@ export type Options = {
     backgroundColor: string,
     canvas: ?HTMLCanvasElement,
     foreignObjectRendering: boolean,
+    ignoreElements?: HTMLElement => boolean,
     imageTimeout: number,
     logging: boolean,
+    onclone?: Document => void,
     proxy: ?string,
     removeContainer: ?boolean,
     scale: number,
@@ -32,14 +33,9 @@ export type Options = {
 };
 
 const html2canvas = (element: HTMLElement, conf: ?Options): Promise<*> => {
-    // eslint-disable-next-line no-console
-    if (typeof console === 'object' && typeof console.log === 'function') {
-        // eslint-disable-next-line no-console
-        console.log(`html2canvas ${__VERSION__}`);
-    }
-
     const config = conf || {};
     const logger = new Logger(typeof config.logging === 'boolean' ? config.logging : true);
+    logger.log(`html2canvas ${__VERSION__}`);
 
     if (__DEV__ && typeof config.onrendered === 'function') {
         logger.error(
@@ -53,15 +49,6 @@ const html2canvas = (element: HTMLElement, conf: ?Options): Promise<*> => {
     }
     const defaultView = ownerDocument.defaultView;
 
-    const scrollX = defaultView.pageXOffset;
-    const scrollY = defaultView.pageYOffset;
-
-    const isDocument = element.tagName === 'HTML' || element.tagName === 'BODY';
-
-    const {width, height, left, top} = isDocument
-        ? parseDocumentSize(ownerDocument)
-        : parseBounds(element, scrollX, scrollY);
-
     const defaultOptions = {
         async: true,
         allowTaint: false,
@@ -74,10 +61,6 @@ const html2canvas = (element: HTMLElement, conf: ?Options): Promise<*> => {
         scale: defaultView.devicePixelRatio || 1,
         target: new CanvasRenderer(config.canvas),
         useCORS: false,
-        x: left,
-        y: top,
-        width: Math.ceil(width),
-        height: Math.ceil(height),
         windowWidth: defaultView.innerWidth,
         windowHeight: defaultView.innerHeight,
         scrollX: defaultView.pageXOffset,
@@ -96,5 +79,4 @@ const html2canvas = (element: HTMLElement, conf: ?Options): Promise<*> => {
 };
 
 html2canvas.CanvasRenderer = CanvasRenderer;
-
+export default html2canvas;
-module.exports = html2canvas;

src/renderer/CanvasRenderer.js

@@ -26,7 +26,10 @@ const addColorStops = (
     const maxStop = Math.max.apply(null, gradient.colorStops.map(colorStop => colorStop.stop));
     const f = 1 / Math.max(1, maxStop);
     gradient.colorStops.forEach(colorStop => {
-        canvasGradient.addColorStop(f * colorStop.stop, colorStop.color.toString());
+        canvasGradient.addColorStop(
+            Math.floor(Math.max(0, f * colorStop.stop)),
+            colorStop.color.toString()
+        );
     });
 };
 
@@ -98,6 +101,7 @@ export default class CanvasRenderer implements RenderTarget<HTMLCanvasElement> {
     }
 
     getTarget(): Promise<HTMLCanvasElement> {
+        this.canvas.getContext('2d').setTransform(1, 0, 0, 1, 0, 0);
         return Promise.resolve(this.canvas);
     }
 
@@ -250,7 +254,7 @@ export default class CanvasRenderer implements RenderTarget<HTMLCanvasElement> {
                             const {baseline} = this.options.fontMetrics.getMetrics(font);
                             this.rectangle(
                                 text.bounds.left,
-                                Math.round(text.bounds.top + text.bounds.height - baseline),
+                                Math.round(text.bounds.top + baseline),
                                 text.bounds.width,
                                 1,
                                 textDecorationColor

src/renderer/RefTestRenderer.js

@@ -24,7 +24,7 @@ import type {TextBounds} from '../TextBounds';
 import {TEXT_DECORATION_STYLE, TEXT_DECORATION_LINE} from '../parsing/textDecoration';
 import {PATH} from '../drawing/Path';
 
-class RefTestRenderer implements RenderTarget<string> {
+export default class RefTestRenderer implements RenderTarget<string> {
     options: RenderOptions;
     indent: number;
     lines: Array<string>;
@@ -268,5 +268,3 @@ class RefTestRenderer implements RenderTarget<string> {
         this.lines.push(`${new Array(this.indent + 1).join(' ')}${text}`);
     }
 }
-
-module.exports = RefTestRenderer;

tests/reftests/border/radius.html

@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <script type="text/javascript" src="../../test.js"></script>
     <style type="text/css">
-      div {
+      .box {
         width: 200px;
         height: 200px;
         display: inline-block;
@@ -63,6 +63,21 @@
         border-radius: 200px;
       }
 
+      .gauge{
+          display: inline-block;
+          width: 100px;
+          height: 50px;
+          background: green;
+          margin-bottom: 20px;
+      }
+
+       .gauge1{ border-radius: 25px 25px 0 0   / 25px 25px 0 0; }
+       .gauge2{ border-radius: 100px 100px 0 0 / 50px 50px 0 0; }
+       .gauge3{ border-radius: 100px 100px 0 0 / 100px 100px 0 0; }
+       .gauge4{ border-radius: 300px 100px 0 0  / 100px 100px 0 0; }
+       .gauge5{ border-radius: 400px 400px 50px 50px / 50px 50px 50px 50px; }
+
+
       html {
         background: #3a84c3;
       }
@@ -70,11 +85,16 @@
   </head>
   <body>
 
-    <div class="box1">&nbsp;</div>
+    <div class="box box1">&nbsp;</div>
-    <div class="box2">&nbsp;</div>
+    <div class="box box2">&nbsp;</div>
-    <div class="box3">&nbsp;</div>
+    <div class="box box3">&nbsp;</div>
-    <div class="box4">&nbsp;</div>
+    <div class="box box4">&nbsp;</div>
-    <div class="box5">&nbsp;</div>
+    <div class="box box5">&nbsp;</div>
-    <div class="box6">&nbsp;</div>
+    <div class="box box6">&nbsp;</div>
+    <div class="gauge gauge1"></div>
+    <div class="gauge gauge2"></div>
+    <div class="gauge gauge3"></div>
+    <div class="gauge gauge4"></div>
+    <div class="gauge gauge5"></div>
   </body>
 </html>

tests/reftests/dynamicstyle.html

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Dynamic style</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <script type="text/javascript" src="../test.js"></script>
+    <style id="style">
+        @font-face {
+            font-family: 'Roboto';
+            font-style: normal;
+            font-weight: 400;
+            src: local('Roboto'), local('Roboto-Regular'), url(https://fonts.gstatic.com/s/roboto/v18/CWB0XYA8bzo0kSThX0UTuA.woff2) format('woff2');
+            unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215;
+        }
+        body { font-family: "Roboto", serif }
+
+        div {
+            padding: 20px;
+        }
+        .div1 {
+            background: darkred;
+            color: white;
+        }
+        @media (min-width: 10px) {
+            .div1 {
+                background: darkgreen;
+            }
+        }
+    </style>
+    <script>
+        document.querySelector('#style').sheet.insertRule(
+            '.div2 { background: darkgreen; color:white; }',
+            document.querySelector('#style').sheet.cssRules.length
+        );
+    </script>
+</head>
+<body>
+<div class="div1">Static styles</div>
+<div class="div2">Dynamic styles</div>
+</body>
+</html>
+

tests/reftests/ignore.txt

@@ -0,0 +1,2 @@
+[Safari]/tests/reftests/acid2.html
+[Safari]/tests/reftests/background/encoded.html

tests/reftests/options/ignore.html

@@ -4,7 +4,9 @@
     <title>element render test</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <script>
-
+        h2cOptions = {ignoreElements: function(element) {
+            return element.className === 'ignored';
+        }};
     </script>
     <script type="text/javascript" src="../../test.js"></script>
     <style>
@@ -15,7 +17,7 @@
             background: green;
         }
 
-        #ignored {
+        #ignored, .ignored {
             background: red;
             width: 100px;
             height: 100px;
@@ -32,10 +34,11 @@
 <div id="ignored" data-html2canvas-ignore>
     great failure
 </div>
+<div class="ignored">
+    ignore predicate
+</div>
 <div id="div1">
     great success
 </div>
-
-
 </body>
 </html>

tests/reftests/options/onclone.html

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>element render test</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <script>
+        h2cOptions = {onclone: function(document) {
+            const remove = document.querySelector('.ignored');
+            remove.parentNode.removeChild(remove);
+        }};
+    </script>
+    <script type="text/javascript" src="../../test.js"></script>
+    <style>
+        #div1 {
+
+            width: 100px;
+            height: 100px;
+            background: green;
+        }
+
+        #ignored, .ignored {
+            background: red;
+            width: 100px;
+            height: 100px;
+        }
+
+        body, html {
+            margin: 0;
+            padding: 0;
+        }
+    </style>
+
+</head>
+<body>
+<div class="ignored">
+    ignore during onclone
+</div>
+<div id="div1">
+    great success
+</div>
+</body>
+</html>

tests/test.js

@@ -21,7 +21,7 @@ var REFTEST = window.location.search.indexOf('reftest') !== -1;
         .concat([
             '/node_modules/jquery/dist/jquery.min',
             '/dist/html2canvas',
-            '/dist/RefTestRenderer'
+            '/build/RefTestRenderer'
         ])
         .forEach(appendScript);
 

tests/testrunner.js

@@ -75,7 +75,7 @@ const assertPath = (result, expected, desc) => {
             .filter(test => {
                 return (
                     !Array.isArray(reftests.ignoredTests[test]) ||
-                    reftests.ignoredTests[test].indexOf(query.browser) === -1
+                    reftests.ignoredTests[test].indexOf(platform.name) === -1
                 );
             })
             .forEach(url => {
@@ -342,79 +342,37 @@ const assertPath = (result, expected, desc) => {
                                 }
 
                                 if (window.__karma__) {
-                                    const MAX_CHUNK_SIZE = 75000;
+                                    return new Promise((resolve, reject) => {
+                                        const xhr =
+                                            'withCredentials' in new XMLHttpRequest()
+                                                ? new XMLHttpRequest()
+                                                : new XDomainRequest();
 
-                                    const sendScreenshot = (tries, body, server) => {
+                                        xhr.onload = () => {
-                                        return new Promise((resolve, reject) => {
+                                            if (
-                                            const xhr =
+                                                typeof xhr.status !== 'number' ||
-                                                'withCredentials' in new XMLHttpRequest()
+                                                xhr.status === 200
-                                                    ? new XMLHttpRequest()
+                                            ) {
-                                                    : new XDomainRequest();
+                                                resolve();
-
+                                            } else {
-                                            xhr.onload = () => {
+                                                reject(
-                                                if (
+                                                    `Failed to send screenshot with status ${xhr.status}`
-                                                    typeof xhr.status !== 'number' ||
-                                                    xhr.status === 200
-                                                ) {
-                                                    resolve();
-                                                } else {
-                                                    reject(
-                                                        `Failed to send screenshot with status ${xhr.status}`
-                                                    );
-                                                }
-                                            };
-                                            xhr.onerror = reject;
-
-                                            xhr.open('POST', server, true);
-                                            xhr.send(body);
-                                        }).catch(e => {
-                                            if (tries > 0) {
-                                                // Older edge browsers and some safari browsers have issues sending large xhr through saucetunnel
-                                                const data = canvas.toDataURL();
-                                                const totalCount = Math.ceil(
-                                                    data.length / MAX_CHUNK_SIZE
-                                                );
-                                                return Promise.all(
-                                                    Array.apply(
-                                                        null,
-                                                        Array(totalCount)
-                                                    ).map((x, part) =>
-                                                        sendScreenshot(
-                                                            0,
-                                                            JSON.stringify({
-                                                                screenshot: data.substr(
-                                                                    part * MAX_CHUNK_SIZE,
-                                                                    MAX_CHUNK_SIZE
-                                                                ),
-                                                                part,
-                                                                totalCount,
-                                                                test: url,
-                                                                platform: {
-                                                                    name: platform.name,
-                                                                    version: platform.version
-                                                                }
-                                                            }),
-                                                            'http://localhost:8000/screenshot/chunk'
-                                                        )
-                                                    )
                                                 );
                                             }
+                                        };
+                                        xhr.onerror = reject;
 
-                                            return Promise.reject(e);
+                                        xhr.open('POST', 'http://localhost:8000/screenshot', true);
-                                        });
+                                        xhr.send(JSON.stringify({
-                                    };
-                                    return sendScreenshot(
-                                        1,
-                                        JSON.stringify({
                                             screenshot: canvas.toDataURL(),
                                             test: url,
                                             platform: {
                                                 name: platform.name,
                                                 version: platform.version
                                             }
-                                        }),
+                                        }));
-                                        'http://localhost:8000/screenshot'
+                                    });
-                                    );
+
                                 }
                             });
                     });

webpack.config.js

@@ -18,7 +18,7 @@ const plugins = [
 ];
 
 const modules = {
-    loaders: [{
+    rules: [{
         test: /\.js$/,
         exclude: /node_modules/,
         loader: 'babel-loader'
@@ -27,20 +27,26 @@ const modules = {
 
 module.exports = [
     {
+        mode: 'development',
         entry: './src/index.js',
         output: {
-            filename: './dist/html2canvas.js',
+            path: path.resolve(__dirname, 'dist'),
+            filename: 'html2canvas.js',
             library: 'html2canvas',
+            libraryExport: 'default',
             libraryTarget: 'umd'
         },
         module: modules,
         plugins
     },
     {
+        mode: 'production',
         entry: './src/index.js',
         output: {
-            filename: './dist/html2canvas.min.js',
+            path: path.resolve(__dirname, 'dist'),
+            filename: 'html2canvas.min.js',
             library: 'html2canvas',
+            libraryExport: 'default',
             libraryTarget: 'umd'
         },
         module: modules,
@@ -54,19 +60,24 @@ module.exports = [
         ]
     },
     {
+        mode: 'production',
         entry: './src/renderer/RefTestRenderer.js',
         output: {
-            filename: './dist/RefTestRenderer.js',
+            path: path.resolve(__dirname, 'build'),
+            filename: 'RefTestRenderer.js',
             library: 'RefTestRenderer',
+            libraryExport: 'default',
             libraryTarget: 'umd'
         },
         module: modules,
         plugins
     },
     {
+        mode: 'production',
         entry: './tests/testrunner.js',
         output: {
-            filename: './build/testrunner.js',
+            path: path.resolve(__dirname, 'build'),
+            filename: 'testrunner.js',
             library: 'testrunner',
             libraryTarget: 'umd'
         },

www/package.json

@@ -5,30 +5,36 @@
   "private": true,
   "author": "Niklas von Hertzen",
   "dependencies": {
-    "cpy-cli": "^1.0.1",
+    "cpy-cli": "^2.0.0",
-    "gatsby": "^1.9.127",
+    "gatsby": "^2.3.14",
-    "gatsby-link": "^1.6.30",
+    "gatsby-link": "^2.0.16",
-    "gatsby-plugin-catch-links": "^1.0.13",
+    "gatsby-plugin-catch-links": "^2.0.13",
-    "gatsby-plugin-glamor": "^1.6.9",
+    "gatsby-plugin-glamor": "^2.0.9",
-    "gatsby-plugin-google-analytics": "^1.0.14",
+    "gatsby-plugin-google-analytics": "^2.0.18",
-    "gatsby-plugin-react-helmet": "^1.0.8",
+    "gatsby-plugin-react-helmet": "^3.0.12",
-    "gatsby-plugin-twitter": "^1.0.14",
+    "gatsby-plugin-twitter": "^2.0.13",
-    "gatsby-plugin-typography": "^1.7.10",
+    "gatsby-plugin-typography": "^2.2.10",
-    "gatsby-remark-prismjs": "^1.2.10",
+    "gatsby-remark-prismjs": "^3.2.7",
-    "gatsby-source-filesystem": "^1.5.9",
+    "gatsby-source-filesystem": "^2.0.28",
-    "gatsby-transformer-remark": "^1.7.23",
+    "gatsby-transformer-remark": "^2.3.8",
-    "gzip-size": "^4.1.0",
+    "glamor": "^2.20.40",
-    "html2canvas": "1.0.0-alpha.4",
+    "gzip-size": "^5.0.0",
+    "html2canvas": "^1.0.0-alpha.12",
     "mkdirp": "^0.5.1",
-    "typography": "^0.16.6",
+    "prismjs": "^1.16.0",
-    "typography-theme-github": "^0.15.10"
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-helmet": "^5.2.0",
+    "react-typography": "^0.16.19",
+    "typography": "^0.16.19",
+    "typography-theme-github": "^0.16.19"
   },
   "license": "MIT",
   "main": "n/a",
   "scripts": {
     "copybuild": "mkdirp public/dist && cpy ../dist/*.js public/dist",
     "build": "npm run copybuild && gatsby build",
-    "develop": "gatsby develop",
+    "start": "gatsby develop",
     "test": "echo \"Error: no test specified\" && exit 1"
   }
 }

www/src/components/example.js

@@ -37,6 +37,7 @@ class CanvasContainer extends Component {
             >
                 <img
                     src={close}
+                    alt="Close"
                     css={{position: 'absolute', right: '20px', top: '20px', cursor: 'pointer'}}
                 />
             </div>
@@ -123,6 +124,7 @@ export default class Example extends Component {
                                     flex: 1,
                                     margin: 0
                                 }}
+                                alt="Try html2canvas"
                             />
                         </div>
                     </div>

www/src/components/footer.js

@@ -4,14 +4,25 @@ export default () =>
     <footer
         css={{
             backgroundColor: '#558b2f',
-            color: 'rgba(255,255,255,0.8)',
+            color: 'rgba(255,255,255, 0.8)',
             fontWeight: 300,
             minHeight: '50px',
             lineHeight: '50px',
             padding: '10px 0px'
         }}
     >
-        <div css={{margin: '0 auto', width: '85%'}}>
+        <div
+            css={{
+                margin: '0 auto',
+                fontSize: '10.5px',
+                textAlign: 'center',
+                '@media(min-width: 1000px)': {
+                    textAlign: 'left',
+                    width: '85%',
+                    fontSize: '14.5px'
+                }
+            }}
+        >
             Created by{' '}
             <a href="https://hertzen.com" css={{color: '#fff', fontWeight: 'bold'}}>
                 Niklas von Hertzen

www/src/components/layout.css

@@ -36,9 +36,22 @@ table {
     border: 1px solid #ddd;
 }
 
+table tr:nth-child(odd) {
+    background-color: #f9f9f9;
+}
+
 th {
     padding: 8px;
     border: 1px solid #ddd;
+    border-bottom-width: 2px;
+}
+
+td {
+    padding: 8px;
+}
+
+th:first-child, td:first-child {
+    padding-left: 8px;
 }
 
 :not(pre) > code {

www/src/components/layout.js

@@ -1,19 +1,14 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
-require('prismjs/themes/prism-solarizedlight.css');
+import './layout.css';
-import './index.css';
 import Example from '../components/example';
 
+require('prismjs/themes/prism-solarizedlight.css');
 const TemplateWrapper = ({children}) =>
     <div>
         <Helmet title="html2canvas - Screenshots with JavaScript" />
-        {children()}
+        {children}
         <Example />
     </div>;
 
-TemplateWrapper.propTypes = {
-    children: PropTypes.func
-};
-
 export default TemplateWrapper;

www/src/components/navigation.js

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, {Component} from 'react';
 import Link from 'gatsby-link';
 import logo from '../images/logo.svg';
+import menu from '../images/ic_menu_black_24px.svg';
 
 const lineLinkStyle = {
     lineHeight: '44px',
@@ -16,15 +17,17 @@ const lineLinkStyle = {
 };
 
 const navStyle = {
-    height: '100%',
+    '@media(min-width: 1000px)': {
-    width: '300px',
+        position: 'fixed',
-    position: 'fixed',
+        top: 0,
-    top: 0,
+        left: 0,
-    left: 0,
+        width: '300px',
+        boxShadow:
+            '0 2px 2px 0 rgba(0,0,0,0.14), 0 1px 5px 0 rgba(0,0,0,0.12), 0 3px 1px -2px rgba(0,0,0,0.2)',
+        height: '100%'
+    },
     fontSize: '13px',
-    backgroundColor: '#fff',
+    backgroundColor: '#fff'
-    boxShadow:
-        '0 2px 2px 0 rgba(0,0,0,0.14), 0 1px 5px 0 rgba(0,0,0,0.12), 0 3px 1px -2px rgba(0,0,0,0.2)'
 };
 
 const links = [
@@ -36,31 +39,71 @@ const links = [
     {href: '/faq', text: 'FAQ'}
 ];
 
-export default () =>
+export default class Navigation extends Component {
-    <div css={navStyle}>
+    constructor(props) {
-        <Link to="/" css={{background: '#558b2f', display: 'block', padding: '24px 30px 24px'}}>
+        super(props);
-            <img src={logo} css={{margin: 0}} />
+        this.state = {open: false};
-        </Link>
+    }
-        <ul
+    render() {
-            style={{
+        return (
-                listStyle: 'none',
+            <div css={navStyle}>
-                margin: 0,
+                <div
-                padding: 0
+                    css={{
-            }}
+                        background: '#558b2f',
-        >
+                        alignItems: 'center',
-            {links.map(({href, text}, i) =>
+                        padding: '24px 30px 24px 0px',
-                <li style={{padding: 0, margin: 0}} key={i}>
+                        display: 'flex',
-                    <Link
+                        '@media(min-width: 1000px)': {
-                        to={href}
+                            padding: '24px 30px 24px 30px'
-                        css={lineLinkStyle}
+                        }
-                        activeStyle={{
+                    }}
-                            backgroundColor: '#7cb342',
+                >
-                            color: '#fff'
+                    <img
+                        src={menu}
+                        onClick={() => this.setState(s => ({open: !s.open}))}
+                        alt="Menu"
+                        css={{
+                            width: '50px',
+                            cursor: 'pointer',
+                            margin: '0 20px 0',
+                            display: 'block',
+                            '@media(min-width: 1000px)': {
+                                display: 'none'
+                            }
                         }}
-                    >
+                    />
-                        {text}
+                    <Link to="/">
+                        <img src={logo} css={{margin: 0}} alt="html2canvas" />
                     </Link>
-                </li>
+                </div>
-            )}
+
-        </ul>
+                <ul
-    </div>;
+                    css={{
+                        display: this.state.open ? 'block' : 'none',
+                        listStyle: 'none',
+                        margin: 0,
+                        padding: 0,
+                        '@media(min-width: 1000px)': {
+                            display: 'block'
+                        }
+                    }}
+                >
+                    {links.map(({href, text}, i) =>
+                        <li style={{padding: 0, margin: 0}} key={i}>
+                            <Link
+                                to={href}
+                                css={lineLinkStyle}
+                                activeStyle={{
+                                    backgroundColor: '#7cb342',
+                                    color: '#fff'
+                                }}
+                            >
+                                {text}
+                            </Link>
+                        </li>
+                    )}
+                </ul>
+            </div>
+        );
+    }
+}

www/src/images/ic_menu_black_24px.svg

@@ -0,0 +1,4 @@
+<svg fill="#ffffff" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/>
+</svg>

www/src/pages/404.js

@@ -1,9 +1,10 @@
 import React from 'react';
+import Layout from '../components/layout';
 
 const NotFoundPage = () =>
-    <div>
+    <Layout>
         <h1>NOT FOUND</h1>
         <p>You just hit a route that doesn&#39;t exist... the sadness.</p>
-    </div>;
+    </Layout>;
 
 export default NotFoundPage;

www/src/pages/index.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import Link from 'gatsby-link';
 import logo from '../images/logo_icon.svg';
+import Layout from '../components/layout';
 import Footer from '../components/footer';
 import Carbon from '../components/carbon';
 
@@ -23,6 +24,7 @@ const linkStyle = {
 
 export default ({data}) => {
     return (
+        <Layout>
         <div
             css={{
                 background: '#558b2f',
@@ -48,15 +50,31 @@ export default ({data}) => {
                     }}
                 >
                     <div css={{display: 'flex', alignItems: 'center', justifyContent: 'center'}}>
-                        <img src={logo} />
+                        <img src={logo} alt="html2canvas" />
                         <h1>html2canvas</h1>
                     </div>
                     <h4 css={{color: 'rgba(255, 255, 255, 0.6)', fontWeight: 300}}>
                         Screenshots with JavaScript
                     </h4>
 
-                    <div css={{display: 'flex', justifyContent: 'center'}}>
+                    <div
-                        <div>
+                        css={{
+                            display: 'flex',
+                            justifyContent: 'center',
+                            flexDirection: 'column',
+                            '@media(min-width: 1000px)': {
+                                flexDirection: 'row'
+                            }
+                        }}
+                    >
+                        <div
+                            css={{
+                                display: 'none',
+                                '@media(min-width: 1000px)': {
+                                    display: 'block'
+                                }
+                            }}
+                        >
                             <h4>HTML</h4>
                             <div
                                 css={{marginRight: '5px'}}
@@ -70,7 +88,14 @@ export default ({data}) => {
                                 }}
                             />
                         </div>
-                        <div>
+                        <div
+                            css={{
+                                display: 'none',
+                                '@media(min-width: 1000px)': {
+                                    display: 'block'
+                                }
+                            }}
+                        >
                             <h4>JavaScript</h4>
                             <div
                                 css={{marginLeft: '5px'}}
@@ -88,7 +113,7 @@ export default ({data}) => {
 
                     <div css={{margin: '20px'}}>
                         <a
-                            href="#"
+                            href="/documentation"
                             css={linkStyle}
                             onClick={e => {
                                 e.preventDefault();
@@ -101,14 +126,25 @@ export default ({data}) => {
                             Documentation
                         </Link>
                     </div>
-                    <div css={{display: 'flex'}}>
+                    <div
+                        css={{
+                            display: 'flex',
+                            flexDirection: 'column',
+                            '@media(min-width: 1000px)': {
+                                flexDirection: 'row'
+                            }
+                        }}
+                    >
                         <div
                             css={{
                                 flex: 1,
                                 backgroundColor: '#558b2f',
                                 padding: '10px 20px',
                                 borderRadius: '10px',
-                                marginRight: '5px'
+                                marginBottom: '10px',
+                                '@media(min-width: 1000px)': {
+                                    marginRight: '5px'
+                                }
                             }}
                         >
                             <Carbon />
@@ -116,12 +152,16 @@ export default ({data}) => {
                         <div
                             css={{
                                 flex: 1,
-                                marginLeft: '5px',
+
                                 backgroundColor: '#558b2f',
                                 padding: '10px 20px',
                                 borderRadius: '10px',
                                 textAlign: 'left',
-                                marginRight: '5px'
+                                marginBottom: '10px',
+                                '@media(min-width: 1000px)': {
+                                    marginLeft: '5px',
+                                    marginRight: '5px'
+                                }
                             }}
                         >
                             <h6>Install NPM</h6>
@@ -143,16 +183,20 @@ export default ({data}) => {
                         <div
                             css={{
                                 flex: 1,
-                                marginLeft: '5px',
                                 backgroundColor: '#558b2f',
                                 padding: '10px 20px',
                                 borderRadius: '10px',
-                                textAlign: 'left'
+                                textAlign: 'left',
+                                marginBottom: '10px',
+                                '@media(min-width: 1000px)': {
+                                    marginLeft: '5px'
+                                }
                             }}
                         >
                             <h5>Connect</h5>
                             <div css={{height: '35px'}}>
                                 <iframe
+                                    title="Github"
                                     src="https://ghbtns.com/github-btn.html?user=niklasvh&repo=html2canvas&type=star&count=true&size=large"
                                     frameBorder="0"
                                     scrolling="0"
@@ -176,6 +220,7 @@ export default ({data}) => {
             </div>
             <Footer />
         </div>
+        </Layout>
     );
 };
 

www/src/templates/docs.js

@@ -4,6 +4,7 @@ import back from '../images/ic_arrow_back_black_24px.svg';
 import next from '../images/ic_arrow_forward_black_24px.svg';
 import Carbon from '../components/carbon';
 import Footer from '../components/footer';
+import Layout from '../components/layout';
 import Helmet from 'react-helmet';
 import Navigation from '../components/navigation';
 
@@ -11,7 +12,7 @@ export default ({data}) => {
     const post = data.markdownRemark;
 
     return (
-        <div>
+        <Layout>
             <Helmet
                 title={`${post.frontmatter.title} - html2canvas`}
                 meta={[{name: 'description', content: post.frontmatter.description}]}
@@ -19,7 +20,9 @@ export default ({data}) => {
             <Navigation />
             <div
                 css={{
-                    marginLeft: '300px',
+                    '@media(min-width: 1000px)': {
+                        marginLeft: '300px'
+                    },
                     display: 'flex',
                     minHeight: '100vh',
                     flexDirection: 'column'
@@ -37,10 +40,23 @@ export default ({data}) => {
                     <div css={{maxWidth: '960px'}}>
                         <div css={{width: '85%', margin: '0 auto', display: 'flex'}}>
                             <div css={{flex: 1}}>
-                                <h1 css={{padding: '20px 0'}}>
+                                <h1
+                                    css={{
+                                        padding: '20px 0',
+                                        fontSize: '2.8rem',
+                                        '@media(min-width: 1000px)': {fontSize: '4.2rem'}
+                                    }}
+                                >
                                     {post.frontmatter.title}
                                 </h1>
-                                <h4 css={{fontWeight: 300, color: 'rgba(255, 255, 255, 0.6)'}}>
+                                <h4
+                                    css={{
+                                        fontWeight: 300,
+                                        color: 'rgba(255, 255, 255, 0.6)',
+                                        fontSize: '1.8rem',
+                                        '@media(min-width: 1000px)': {fontSize: '2.28rem'}
+                                    }}
+                                >
                                     {post.frontmatter.description}
                                 </h4>
                             </div>
@@ -88,7 +104,7 @@ export default ({data}) => {
                                         }}
                                     >
                                         <div css={{height: '24px'}}>
-                                            <img src={back} />
+                                            <img src={back} alt="" />
                                         </div>
                                         <div>
                                             <span
@@ -147,7 +163,7 @@ export default ({data}) => {
                                         </div>
 
                                         <div css={{height: '24px'}}>
-                                            <img src={next} />
+                                            <img src={next} alt="" />
                                         </div>
                                     </Link>
                                   : null}
@@ -156,7 +172,7 @@ export default ({data}) => {
                     : null}
                 <Footer css={{marginLeft: '300px'}} />
             </div>
-        </div>
+        </Layout>
     );
 };
 

www/src/utils/typography.js

@@ -1,5 +1,4 @@
 import Typography from 'typography';
-import githubTheme from 'typography-theme-github';
 
 const theme = {
     googleFonts: [

www/static/CNAME

@@ -0,0 +1 @@
+html2canvas.hertzen.com