mirror of
https://github.com/niklasvh/html2canvas.git
synced 2023-08-10 21:13:10 +03:00
updated build
This commit is contained in:
parent
3c3bf954f5
commit
fb4601c630
@ -43,6 +43,9 @@ function html2canvas(el, userOptions) {
|
|||||||
ready: function (stack) {
|
ready: function (stack) {
|
||||||
document.body.appendChild(stack.canvas);
|
document.body.appendChild(stack.canvas);
|
||||||
},
|
},
|
||||||
|
storageReady: function(obj){
|
||||||
|
obj.Renderer(obj.contextStacks);
|
||||||
|
},
|
||||||
iframeDefault: "default",
|
iframeDefault: "default",
|
||||||
flashCanvasPath: "http://html2canvas.hertzen.com/external/flashcanvas/flashcanvas.js",
|
flashCanvasPath: "http://html2canvas.hertzen.com/external/flashcanvas/flashcanvas.js",
|
||||||
renderViewport: false,
|
renderViewport: false,
|
||||||
@ -771,6 +774,8 @@ html2canvas.prototype.Renderer = function(queue){
|
|||||||
|
|
||||||
var _ = this;
|
var _ = this;
|
||||||
|
|
||||||
|
this.log('Renderer initiated');
|
||||||
|
|
||||||
this.each(this.opts.renderOrder.split(" "),function(i,renderer){
|
this.each(this.opts.renderOrder.split(" "),function(i,renderer){
|
||||||
|
|
||||||
switch(renderer){
|
switch(renderer){
|
||||||
@ -778,6 +783,7 @@ html2canvas.prototype.Renderer = function(queue){
|
|||||||
_.canvas = document.createElement('canvas');
|
_.canvas = document.createElement('canvas');
|
||||||
if (_.canvas.getContext){
|
if (_.canvas.getContext){
|
||||||
_.canvasRenderer(queue);
|
_.canvasRenderer(queue);
|
||||||
|
_.log('Using canvas renderer');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -789,15 +795,25 @@ html2canvas.prototype.Renderer = function(queue){
|
|||||||
var s = document.getElementsByTagName('script')[0];
|
var s = document.getElementsByTagName('script')[0];
|
||||||
s.parentNode.insertBefore(script, s);
|
s.parentNode.insertBefore(script, s);
|
||||||
|
|
||||||
|
*/
|
||||||
if (typeof FlashCanvas != "undefined") {
|
if (typeof FlashCanvas != "undefined") {
|
||||||
_.canvas = document.createElement('canvas');
|
_.canvas = initCanvas(document.getElementById("testflash"));
|
||||||
FlashCanvas.initElement(_.canvas);
|
FlashCanvas.initElement(_.canvas);
|
||||||
|
_.ctx = _.canvas.getContext("2d");
|
||||||
|
// _.canvas = document.createElement('canvas');
|
||||||
|
//
|
||||||
|
_.log('Using Flashcanvas renderer');
|
||||||
_.canvasRenderer(queue);
|
_.canvasRenderer(queue);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
} */
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
case "html":
|
||||||
|
// TODO add renderer
|
||||||
|
_log("Using HTML renderer");
|
||||||
|
return false;
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -806,6 +822,9 @@ html2canvas.prototype.Renderer = function(queue){
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.log('No renderer chosen, rendering quit');
|
||||||
|
return this;
|
||||||
|
|
||||||
// this.canvasRenderer(queue);
|
// this.canvasRenderer(queue);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -987,9 +1006,12 @@ html2canvas.prototype.newText = function(el,textNode,ctx){
|
|||||||
//text = $.trim(text);
|
//text = $.trim(text);
|
||||||
if (text.length>0){
|
if (text.length>0){
|
||||||
switch(bold){
|
switch(bold){
|
||||||
case "401":
|
case 401:
|
||||||
bold = "bold";
|
bold = "bold";
|
||||||
break;
|
break;
|
||||||
|
case 400:
|
||||||
|
bold = "normal";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -1002,6 +1024,7 @@ html2canvas.prototype.newText = function(el,textNode,ctx){
|
|||||||
renderList,
|
renderList,
|
||||||
renderWords = false;
|
renderWords = false;
|
||||||
|
|
||||||
|
|
||||||
text_align = text_align.replace(["-webkit-auto"],["auto"])
|
text_align = text_align.replace(["-webkit-auto"],["auto"])
|
||||||
|
|
||||||
|
|
||||||
@ -1213,7 +1236,8 @@ html2canvas.prototype.parseElement = function(element,stack){
|
|||||||
_.parsing(el,stack);
|
_.parsing(el,stack);
|
||||||
});
|
});
|
||||||
|
|
||||||
this.Renderer(this.contextStacks);
|
this.log('Render queue stored');
|
||||||
|
this.opts.storageReady(this);
|
||||||
this.finish();
|
this.finish();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1278,9 +1302,11 @@ html2canvas.prototype.log = function(a){
|
|||||||
|
|
||||||
if (this.opts.logging){
|
if (this.opts.logging){
|
||||||
|
|
||||||
var logger = window.console.log || function(log){
|
if (window.console && window.console.log){
|
||||||
alert(log);
|
console.log(a);
|
||||||
};
|
}else{
|
||||||
|
alert(a);
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
if (typeof(window.console) != "undefined" && console.log){
|
if (typeof(window.console) != "undefined" && console.log){
|
||||||
console.log(a);
|
console.log(a);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user