merged from dev

This commit is contained in:
Niklas von Hertzen
2011-09-12 21:35:37 +03:00
parent 07c0c13cc1
commit 27ee971bba
26 changed files with 2470 additions and 14360 deletions

View File

@@ -10,6 +10,52 @@
var message,
timeoutTimer,
timer = date.getTime();
var preload = html2canvas.Preload(this[0], {
"complete": function(images){
var queue = html2canvas.Parse(this[0], images);
var canvas = $(html2canvas.Renderer(queue));
var finishTime = new Date();
canvas.css('position','absolute')
.css('left',0).css('top',0);
$('body').append(canvas);
$(canvas).siblings().toggle();
$(window).click(function(){
if (!canvas.is(':visible')){
$(canvas).toggle().siblings().toggle();
throwMessage("Canvas Render visible");
} else{
$(canvas).siblings().toggle();
$(canvas).toggle();
throwMessage("Canvas Render hidden");
}
});
throwMessage('Screenshot created in '+ ((finishTime.getTime()-timer)/1000) + " seconds<br />",4000);
}
});
/*
var date = new Date();
var message,
timeoutTimer,
timer = date.getTime();
var object = $.extend({},{
logging: false,
@@ -54,6 +100,7 @@
new html2canvas(this.get(0), object);
*/
function throwMessage(msg,duration){
@@ -84,5 +131,6 @@
}
};
})( jQuery );