mirror of
https://github.com/niklasvh/html2canvas.git
synced 2023-08-10 21:13:10 +03:00
commit
b59022138d
@ -205,8 +205,7 @@ _html2canvas.Util.BackgroundPosition = function ( el, bounds, image ) {
|
||||
};
|
||||
|
||||
_html2canvas.Util.Extend = function (options, defaults) {
|
||||
var key;
|
||||
for (key in options) {
|
||||
for (var key in options) {
|
||||
if (options.hasOwnProperty(key)) {
|
||||
defaults[key] = options[key];
|
||||
}
|
||||
|
@ -183,6 +183,7 @@ _html2canvas.Preload = function( options ) {
|
||||
|
||||
images.numLoaded++;
|
||||
imageObj.succeeded = true;
|
||||
img.onerror = img.onload = null;
|
||||
start();
|
||||
};
|
||||
img.onerror = function() {
|
||||
@ -207,6 +208,7 @@ _html2canvas.Preload = function( options ) {
|
||||
images.numLoaded++;
|
||||
images.numFailed++;
|
||||
imageObj.succeeded = false;
|
||||
img.onerror = img.onload = null;
|
||||
start();
|
||||
|
||||
};
|
||||
|
@ -19,8 +19,7 @@
|
||||
'//code.jquery.com/jquery-1.6.4.js',
|
||||
'html2canvas',
|
||||
'jquery.plugin.html2canvas'
|
||||
],
|
||||
i = 0, el = null;
|
||||
];
|
||||
var loader = {
|
||||
index: 0,
|
||||
head: document.getElementsByTagName('head')[0],
|
||||
@ -56,7 +55,8 @@
|
||||
delete _.statusline;
|
||||
$(document.documentElement).html2canvas({
|
||||
logging: debug,
|
||||
profile: profile
|
||||
profile: profile,
|
||||
proxy: proxy
|
||||
});
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user