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 remote-tracking branch 'niklasvh/develop' into develop

Browse Source 
Conflicts:
	src/Parse.js
	src/Preload.js
This commit is contained in:
Andy Edinborough
2013-01-03 15:07:38 -06:00
parent 55ed0ffde0 7d7deca342
commit 3edf9fa743
10 changed files with 608 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Preload.js
View File

@ -122,10 +122,9 @@ _html2canvas.Preload = function( options ) {
// opera throws exception on external-content.html
try {
background_image = _html2canvas.Util.getCSS(el, 'backgroundImage');
}catch(e) {
} catch(e) {
h2clog("html2canvas: failed to get background-image - Exception: " + e.message);
}
background_images = _html2canvas.Util.parseBackgroundImage(background_image);
for(var imageIndex = background_images.length; imageIndex-- > 0;) {
background_image = background_images[imageIndex];
@ -136,7 +135,6 @@ _html2canvas.Preload = function( options ) {
background_image.args.length === 0 ) {
continue;
}
if (background_image.method === 'url') {
src = background_image.args[0];
methods.loadImage(src);