mirror/html2canvas
1
0
Fork 0
mirror of https://github.com/niklasvh/html2canvas.git synced 2023-08-10 21:13:10 +03:00
Code Issues Projects Releases Wiki Activity

Moved renderer logic to renderer.js

Browse Source
This commit is contained in:
Niklas von Hertzen 2012-12-29 17:43:15 +02:00
parent 816ff6d3c5
commit c3e9636e4f
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Renderer.js
View File

@ -1,5 +1,5 @@
_html2canvas.Renderer = function(parseQueue, options){ _html2canvas.Renderer = function(parseQueue, options){
var queue = []; var queue = [], renderer;
function sortZ(zStack){ function sortZ(zStack){
var subStacks = [], var subStacks = [],
@ -47,11 +47,20 @@ _html2canvas.Renderer = function(parseQueue, options){
} }
sortZ(parseQueue.zIndex); sortZ(parseQueue.zIndex);
if ( typeof options._renderer._create !== "function" ) {
if (typeof options.renderer === "string" && _html2canvas.Renderer[options.renderer] !== undefined) {
renderer = _html2canvas.Renderer[options.renderer](options);
} else if (typeof options.renderer === "function") {
renderer = options.renderer(options);
} else {
throw new Error("Unknown renderer");
}
if ( typeof renderer._create !== "function" ) {
throw new Error("Invalid renderer defined"); throw new Error("Invalid renderer defined");
} }
return options._renderer._create( parseQueue, options, document, queue, _html2canvas );
return renderer._create( parseQueue, options, document, queue, _html2canvas );
}; };

19
src/Util.js
View File

@ -1,5 +1,4 @@
html2canvas = function( elements, opts ) { window.html2canvas = function(elements, opts) {
var queue, var queue,
canvas, canvas,
options = { options = {
@ -8,7 +7,7 @@ html2canvas = function( elements, opts ) {
elements: elements, elements: elements,
// preload options // preload options
proxy: "http://html2canvas.appspot.com/", proxy: "",
timeout: 0, // no timeout timeout: 0, // no timeout
useCORS: false, // try to load images as CORS (where available), before falling back to proxy useCORS: false, // try to load images as CORS (where available), before falling back to proxy
allowTaint: false, // whether to allow images to taint the canvas, won't need proxy if set to true allowTaint: false, // whether to allow images to taint the canvas, won't need proxy if set to true
@ -27,18 +26,10 @@ html2canvas = function( elements, opts ) {
height: null, height: null,
taintTest: true, // do a taint test with all images before applying to canvas taintTest: true, // do a taint test with all images before applying to canvas
renderer: "Canvas" renderer: "Canvas"
}, renderer; };
options = _html2canvas.Util.Extend(opts, options); options = _html2canvas.Util.Extend(opts, options);
if (typeof options.renderer === "string" && _html2canvas.Renderer[options.renderer] !== undefined) {
options._renderer = _html2canvas.Renderer[options.renderer]( options );
} else if (typeof options.renderer === "function") {
options._renderer = options.renderer( options );
} else {
throw("Unknown renderer");
}
_html2canvas.logging = options.logging; _html2canvas.logging = options.logging;
options.complete = function( images ) { options.complete = function( images ) {
@ -83,7 +74,7 @@ html2canvas = function( elements, opts ) {
}; };
}; };
html2canvas.log = h2clog; // for renderers window.html2canvas.log = h2clog; // for renderers
html2canvas.Renderer = { window.html2canvas.Renderer = {
Canvas: undefined // We are assuming this will be used Canvas: undefined // We are assuming this will be used
}; };