Skip to content

Commit 50f5f53

Browse files
cobexercobexer
committed
cleanup jquery.plugin.html2canvas.js; correctly pass the logging option
1 parent 2fdab0d commit 50f5f53

1 file changed

Lines changed: 25 additions & 99 deletions

File tree

‎src/plugins/jquery.plugin.html2canvas.js‎

Lines changed: 25 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,54 @@
1-
21
/*
32
* jQuery helper plugin for examples and tests
43
*/
5-
64
(function( $ ){
75
$.fn.html2canvas = function(options) {
8-
9-
var date = new Date();
10-
var message,
11-
timeoutTimer,
12-
timer = date.getTime();
13-
14-
var preload = html2canvas.Preload(this[0], {
15-
"complete": function(images){
16-
17-
var queue = html2canvas.Parse(this[0], images);
18-
19-
20-
var canvas = $(html2canvas.Renderer(queue));
21-
var finishTime = new Date();
22-
23-
24-
canvas.css('position','absolute')
25-
.css('left',0).css('top',0);
26-
$('body').append(canvas);
27-
$(canvas).siblings().toggle();
28-
29-
30-
31-
$(window).click(function(){
32-
if (!canvas.is(':visible')){
33-
$(canvas).toggle().siblings().toggle();
34-
throwMessage("Canvas Render visible");
35-
} else{
36-
$(canvas).siblings().toggle();
37-
$(canvas).toggle();
38-
throwMessage("Canvas Render hidden");
39-
}
40-
41-
42-
});
43-
throwMessage('Screenshot created in '+ ((finishTime.getTime()-timer)/1000) + " seconds<br />",4000);
44-
45-
}
46-
});
47-
48-
49-
50-
51-
52-
53-
54-
/*
55-
var date = new Date();
56-
var message,
57-
timeoutTimer,
6+
var date = new Date(),
7+
$message = null,
8+
timeoutTimer = false,
589
timer = date.getTime();
59-
60-
var object = $.extend({},{
61-
logging: false,
62-
proxyUrl: "http://html2canvas.appspot.com/", // running html2canvas-python proxy
63-
ready: function(renderer) {
64-
65-
var finishTime = new Date();
66-
// console.log((finishTime.getTime()-timer)/1000);
67-
10+
html2canvas.logging = options && options.logging;
11+
html2canvas.Preload(this[0], $.extend({
12+
complete: function(images){
13+
var queue = html2canvas.Parse(this[0], images, options),
14+
$canvas = $(html2canvas.Renderer(queue, options)),
15+
finishTime = new Date();
6816

69-
document.body.appendChild(renderer.canvas);
70-
71-
72-
73-
var canvas = $(renderer.canvas);
74-
canvas.css('position','absolute')
75-
.css('left',0).css('top',0);
76-
17+
$canvas.css({ position: 'absolute', left: 0, top: 0 }).appendTo(document.body);
18+
$canvas.siblings().toggle();
7719

78-
79-
// $('body').append(canvas);
80-
$(canvas).siblings().toggle();
81-
82-
throwMessage('Screenshot created in '+ ((finishTime.getTime()-timer)/1000) + " seconds<br />Total of "+renderer.numDraws+" draws performed",4000);
83-
84-
8520
$(window).click(function(){
86-
if (!canvas.is(':visible')){
87-
$(canvas).toggle().siblings().toggle();
21+
if (!$canvas.is(':visible')){
22+
$canvas.toggle().siblings().toggle();
8823
throwMessage("Canvas Render visible");
8924
} else{
90-
$(canvas).siblings().toggle();
91-
$(canvas).toggle();
25+
$canvas.siblings().toggle();
26+
$canvas.toggle();
9227
throwMessage("Canvas Render hidden");
9328
}
94-
95-
9629
});
30+
throwMessage('Screenshot created in '+ ((finishTime.getTime()-timer)/1000) + " seconds<br />",4000);
9731
}
98-
99-
},options)
100-
101-
new html2canvas(this.get(0), object);
102-
103-
*/
104-
32+
}, options));
33+
10534
function throwMessage(msg,duration){
106-
10735
window.clearTimeout(timeoutTimer);
10836
timeoutTimer = window.setTimeout(function(){
109-
message.fadeOut(function(){
110-
message.remove();
111-
});
37+
$message.fadeOut(function(){
38+
$message.remove();
39+
});
11240
},duration || 2000);
113-
$(message).remove();
114-
message = $('<div />').html(msg).css({
41+
if ($message)
42+
$message.remove();
43+
$message = $('<div />').html(msg).css({
11544
margin:0,
11645
padding:10,
11746
background: "#000",
11847
opacity:0.7,
11948
position:"fixed",
12049
top:10,
12150
right:10,
122-
fontFamily: 'Tahoma' ,
51+
fontFamily: 'Tahoma',
12352
color:'#fff',
12453
fontSize:12,
12554
borderRadius:12,
@@ -129,8 +58,5 @@
12958
textDecoration:'none'
13059
}).hide().fadeIn().appendTo('body');
13160
}
132-
13361
};
134-
13562
})( jQuery );
136-

0 commit comments

Comments
 (0)