Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Correctly render input[type="password"] value
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /* | ||
| html2canvas 0.5.0-alpha <http://html2canvas.hertzen.com> | ||
| Copyright (c) 2015 Niklas von Hertzen | ||
| Released under MIT License | ||
| */ | ||
|
|
@@ -580,6 +580,7 @@ window.html2canvas = function(nodeList, options) { | |
| options.removeContainer = typeof(options.removeContainer) === "undefined" ? true : options.removeContainer; | ||
| options.javascriptEnabled = typeof(options.javascriptEnabled) === "undefined" ? false : options.javascriptEnabled; | ||
| options.imageTimeout = typeof(options.imageTimeout) === "undefined" ? 10000 : options.imageTimeout; | ||
| options.renderer = typeof(options.renderer) === "function" ? options.renderer : CanvasRenderer; | ||
|
|
||
| if (typeof(nodeList) === "string") { | ||
| if (typeof(options.proxy) !== "string") { | ||
|
|
@@ -626,7 +627,7 @@ function renderWindow(node, container, options, windowWidth, windowHeight) { | |
| var bounds = getBounds(node); | ||
| var width = options.type === "view" ? windowWidth : documentWidth(clonedWindow.document); | ||
| var height = options.type === "view" ? windowHeight : documentHeight(clonedWindow.document); | ||
| var renderer = new options.renderer(width, height, imageLoader, options, document); | ||
| var parser = new NodeParser(node, renderer, support, imageLoader, options); | ||
| return parser.ready.then(function() { | ||
| log("Finished rendering"); | ||
|
|
@@ -1691,7 +1692,11 @@ NodeContainer.prototype.hasTransform = function() { | |
|
|
||
| NodeContainer.prototype.getValue = function() { | ||
| var value = this.node.value || ""; | ||
| if (this.node.tagName === "SELECT") { | ||
| value = selectionValue(this.node); | ||
| } else if (this.node.type === "password") { | ||
| value = Array(value.length + 1).join('\u2022'); // jshint ignore:line | ||
| } | ||
| return value.length === 0 ? (this.node.placeholder || "") : value; | ||
| }; | ||
|
|
||
|
|
@@ -1859,6 +1864,9 @@ function NodeParser(element, renderer, support, imageLoader, options) { | |
| this.renderQueue = []; | ||
| this.stack = new StackingContext(true, 1, element.ownerDocument, null); | ||
| var parent = new NodeContainer(element, null); | ||
| if (options.background) { | ||
| renderer.rectangle(0, 0, renderer.width, renderer.height, new Color(options.background)); | ||
| } | ||
| if (element === element.ownerDocument.documentElement) { | ||
| // http://www.w3.org/TR/css3-background/#special-backgrounds | ||
| var canvasBackground = new NodeContainer(parent.color('backgroundColor').isTransparent() ? element.ownerDocument.body : element.ownerDocument.documentElement, null); | ||
|
|
@@ -2135,6 +2143,9 @@ NodeParser.prototype.paint = function(container) { | |
| } | ||
| } catch(e) { | ||
| log(e); | ||
| if (this.options.strict) { | ||
| throw e; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
|
|
@@ -3147,9 +3158,6 @@ function CanvasRenderer(width, height) { | |
| this.canvas.height = height; | ||
| } | ||
| this.ctx = this.canvas.getContext("2d"); | ||
| this.taintCtx = this.document.createElement("canvas").getContext("2d"); | ||
| this.ctx.textBaseline = "bottom"; | ||
| this.variables = {}; | ||
|
|
@@ -3159,7 +3167,7 @@ function CanvasRenderer(width, height) { | |
| CanvasRenderer.prototype = Object.create(Renderer.prototype); | ||
|
|
||
| CanvasRenderer.prototype.setFillStyle = function(fillStyle) { | ||
| this.ctx.fillStyle = typeof(fillStyle) === "object" ? fillStyle.toString() : fillStyle; | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
calebj0seph
|
||
| return this.ctx; | ||
| }; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>Mocha Tests</title> | ||
| <link rel="stylesheet" href="lib/mocha.css" /> | ||
| <script src="../../dist/html2canvas.js"></script> | ||
| <script src="../../src/log.js"></script> | ||
| <script src="../../src/renderer.js"></script> | ||
| <script src="../../src/renderers/canvas.js"></script> | ||
| <script src="../assets/jquery-1.6.2.js"></script> | ||
| <script src="lib/expect.js"></script> | ||
| <script src="lib/mocha.js"></script> | ||
| <style> | ||
| .block { | ||
| width: 200px; | ||
| height: 200px; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div id="mocha"></div> | ||
| <script>mocha.setup('bdd')</script> | ||
| <div id="block1" class="block"> | ||
| <input type="text" value="text" /> | ||
| </div> | ||
| <div id="block2" class="block"> | ||
| <input type="password" value="password" /> | ||
| </div> | ||
| <div id="green-block"></div> | ||
| <script> | ||
| describe("Rendering input values", function() { | ||
| it("uses default value for input[type='text']", function(done) { | ||
| CanvasRenderer.prototype.text = function(text) { | ||
| expect(text).to.equal('text'); | ||
| }; | ||
| html2canvas(document.querySelector("#block1"), {renderer: CanvasRenderer, strict: true}).then(function(canvas) { | ||
| expect(canvas.width).to.equal(200); | ||
| expect(canvas.height).to.equal(200); | ||
| done(); | ||
| }).catch(function(error) { | ||
| done(error); | ||
| }); | ||
| }); | ||
|
|
||
| it("uses transformed value for input[type='password']", function(done) { | ||
| var count = 0; | ||
| CanvasRenderer.prototype.text = function(text) { | ||
| expect(text).to.equal('•'); | ||
| count++; | ||
| }; | ||
| html2canvas(document.querySelector("#block2"), {renderer: CanvasRenderer, strict: true}).then(function(canvas) { | ||
| expect(canvas.width).to.equal(200); | ||
| expect(canvas.height).to.equal(200); | ||
| expect(count).to.equal("password".length); | ||
| done(); | ||
| }).catch(function(error) { | ||
| done(error); | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| mocha.checkLeaks(); | ||
| mocha.globals(['jQuery']); | ||
| if (window.mochaPhantomJS) { | ||
| mochaPhantomJS.run(); | ||
| } | ||
| else { | ||
| mocha.run(); | ||
| } | ||
| </script> | ||
| </body> | ||
| </html> |
If
fillStyleis aCanvasGradient, thentypeof(fillStyle) === "object"is true, butfillStyle.toString()will be"[object CanvasGradient]", which is probably not wanted..