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

refactor Preload

Browse Source
This commit is contained in:
Andy Edinborough 2012-12-30 12:20:35 -06:00
parent 3774f3655c
commit 6ce619f0c0
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core.js
View File

@ -51,7 +51,7 @@ _html2canvas.Util.parseBackgroundImage = function (value) {
} }
results.push({ results.push({
prefix: prefix, prefix: prefix,
method: method, method: method.toLowerCase(),
value: block, value: block,
args: args args: args
}); });

18
src/Preload.js
View File

@ -126,10 +126,18 @@ _html2canvas.Preload = function( options ) {
background_images = _html2canvas.Util.parseBackgroundImage(background_image); background_images = _html2canvas.Util.parseBackgroundImage(background_image);
while(!!(background_image = background_images.shift())) { while(!!(background_image = background_images.shift())) {
if(!background_image ||
!background_image.method ||
!background_image.args ||
background_image.args.length === 0 ) {
continue;
}
if ( background_image.value && background_image.value !== "1" && background_image.value !== "none" ) { if (background_image.method === 'url') {
if (/^(-webkit|-o|-moz|-ms|linear)-/.test( background_image.method )) { src = background_image.args[0];
methods.loadImage(src);
} else if( background_image.method.match( /\-gradient$/ ) ) {
img = _html2canvas.Generate.Gradient( background_image.value, _html2canvas.Util.Bounds( el ) ); img = _html2canvas.Generate.Gradient( background_image.value, _html2canvas.Util.Bounds( el ) );
if ( img !== undefined ){ if ( img !== undefined ){
@ -142,12 +150,6 @@ _html2canvas.Preload = function( options ) {
start(); start();
} }
} else {
src = _html2canvas.Util.backgroundImage(background_image.value);
methods.loadImage(src);
}
} }
} }
} }