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

Merge branch 'master' of https://github.com/niklasvh/html2canvas.git

Browse Source
This commit is contained in:
Niklas von Hertzen 2012-03-06 14:37:28 +02:00
commit 59306c839b
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core.js
View File

@ -205,13 +205,12 @@ _html2canvas.Util.BackgroundPosition = function ( el, bounds, image ) {
}; };
_html2canvas.Util.Extend = function (options, defaults) { _html2canvas.Util.Extend = function (options, defaults) {
var key; for (var key in options) {
for (key in options) {
if (options.hasOwnProperty(key)) { if (options.hasOwnProperty(key)) {
defaults[key] = options[key]; defaults[key] = options[key];
} }
} }
return defaults; return defaults;
}; };
_html2canvas.Util.Children = function(el) { _html2canvas.Util.Children = function(el) {

2
src/Preload.js
View File

@ -183,6 +183,7 @@ _html2canvas.Preload = function( options ) {
images.numLoaded++; images.numLoaded++;
imageObj.succeeded = true; imageObj.succeeded = true;
img.onerror = img.onload = null;
start(); start();
}; };
img.onerror = function() { img.onerror = function() {
@ -207,6 +208,7 @@ _html2canvas.Preload = function( options ) {
images.numLoaded++; images.numLoaded++;
images.numFailed++; images.numFailed++;
imageObj.succeeded = false; imageObj.succeeded = false;
img.onerror = img.onload = null;
start(); start();
}; };

14
src/plugins/bookmarklet.js
View File

@ -16,11 +16,10 @@
'src/plugins/jquery.plugin.html2canvas' 'src/plugins/jquery.plugin.html2canvas'
], ],
relFiles = [ relFiles = [
'//code.jquery.com/jquery-1.6.4.js', '//code.jquery.com/jquery-1.6.4.js',
'html2canvas', 'html2canvas',
'jquery.plugin.html2canvas' 'jquery.plugin.html2canvas'
], ];
i = 0, el = null;
var loader = { var loader = {
index: 0, index: 0,
head: document.getElementsByTagName('head')[0], head: document.getElementsByTagName('head')[0],
@ -37,12 +36,12 @@
el.onerror = function() { el.onerror = function() {
_.statusline.style.color = 'red'; _.statusline.style.color = 'red';
_.statusline.innerHTML = _.statusline.innerHTML + ' failed'; _.statusline.innerHTML = _.statusline.innerHTML + ' failed';
_.statusline.onclick = function() { _.statusline.onclick = function() {
_.statusline.parentNode.removeChild(_.statusline); _.statusline.parentNode.removeChild(_.statusline);
}; };
}; };
if (_.files[_.index].substr(0, 2) === '//') { if (_.files[_.index].substr(0, 2) === '//') {
el.src = _.files[_.index]; el.src = _.files[_.index];
} }
else { else {
el.src = server + '/' + _.files[_.index] + '.js'; el.src = server + '/' + _.files[_.index] + '.js';
@ -56,7 +55,8 @@
delete _.statusline; delete _.statusline;
$(document.documentElement).html2canvas({ $(document.documentElement).html2canvas({
logging: debug, logging: debug,
profile: profile profile: profile,
proxy: proxy
}); });
} }
} }