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 branch 'upstream/master'

Browse Source
This commit is contained in:
Niklas von Hertzen 2011-09-13 17:09:42 +03:00
commit a75f41c076
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/html2canvas.js
View File

@ -192,9 +192,7 @@ html2canvas.Generate.Gradient = function(src, bounds) {
} }
} }
} }
if ( tmp = src.match(/-webkit-linear-gradient\((.*)\)/) ) { if ( tmp = src.match(/-webkit-linear-gradient\((.*)\)/) ) {
position = tmp[1].split( ",", 1 )[0]; position = tmp[1].split( ",", 1 )[0];
getColors( tmp[1].substr( position.length + 2 ) ); getColors( tmp[1].substr( position.length + 2 ) );
position = position.split(' '); position = position.split(' ');
@ -221,8 +219,7 @@ html2canvas.Generate.Gradient = function(src, bounds) {
} }
} else if (tmp = src.match(/-webkit-gradient\(linear, (\d+)% (\d+)\%, (\d+)% (\d+)%, from\((.*)\), to\((.*)\)\)/)) { } else if (tmp = src.match(/-webkit-gradient\(linear, (\d+)[%]{0,1} (\d+)[%]{0,1}, (\d+)[%]{0,1} (\d+)[%]{0,1}, from\((.*)\), to\((.*)\)\)/)) {
p0 = (tmp[1] * bounds.width) / 100; p0 = (tmp[1] * bounds.width) / 100;
p1 = (tmp[2] * bounds.height) / 100; p1 = (tmp[2] * bounds.height) / 100;
p2 = (tmp[3] * bounds.width) / 100; p2 = (tmp[3] * bounds.width) / 100;
@ -232,7 +229,6 @@ html2canvas.Generate.Gradient = function(src, bounds) {
steps.push(tmp[6]); steps.push(tmp[6]);
} else if (tmp = src.match(/-moz-linear-gradient\((\d+)% (\d+)%, (.*)\)/)) { } else if (tmp = src.match(/-moz-linear-gradient\((\d+)% (\d+)%, (.*)\)/)) {
p0 = (tmp[1] * bounds.width) / 100; p0 = (tmp[1] * bounds.width) / 100;
p1 = (tmp[2] * bounds.width) / 100; p1 = (tmp[2] * bounds.width) / 100;
p2 = bounds.width - p0; p2 = bounds.width - p0;

4
src/Generate.js
View File

@ -69,7 +69,7 @@ html2canvas.Generate.Gradient = function(src, bounds) {
} }
} else if (tmp = src.match(/-webkit-gradient\(linear, (\d+)% (\d+)\%, (\d+)% (\d+)%, from\((.*)\), to\((.*)\)\)/)) { } else if (tmp = src.match(/-webkit-gradient\(linear, (\d+)[%]{0,1} (\d+)[%]{0,1}, (\d+)[%]{0,1} (\d+)[%]{0,1}, from\((.*)\), to\((.*)\)\)/)) {
p0 = (tmp[1] * bounds.width) / 100; p0 = (tmp[1] * bounds.width) / 100;
p1 = (tmp[2] * bounds.height) / 100; p1 = (tmp[2] * bounds.height) / 100;
@ -79,7 +79,7 @@ html2canvas.Generate.Gradient = function(src, bounds) {
steps.push(tmp[5]); steps.push(tmp[5]);
steps.push(tmp[6]); steps.push(tmp[6]);
} else if (tmp = src.match(/-moz-linear-gradient\((\d+)% (\d+)%, (.*)\)/)) { } else if (tmp = src.match(/-moz-linear-gradient\((\d+)[%]{0,1} (\d+)[%]{0,1}, (.*)\)/)) {
p0 = (tmp[1] * bounds.width) / 100; p0 = (tmp[1] * bounds.width) / 100;
p1 = (tmp[2] * bounds.width) / 100; p1 = (tmp[2] * bounds.width) / 100;