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

remove legacy code

Browse Source
This commit is contained in:
MoyuScript 2013-01-11 20:38:33 +02:00
parent c9e182c7a9
commit 8b68abc8e4
1 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/Core.js
View File

@ -16,13 +16,13 @@ _html2canvas.Util = {};
_html2canvas.Util.isElementVisible = function (element) { _html2canvas.Util.isElementVisible = function (element) {
return ( return (
_html2canvas.Util.getCSS( element, 'display' ) !== "none" && _html2canvas.Util.getCSS( element, 'display' ) !== "none" &&
_html2canvas.Util.getCSS( element, 'visibility' ) !== "hidden" && _html2canvas.Util.getCSS( element, 'visibility' ) !== "hidden" &&
!element.hasAttribute( "data-html2canvas-ignore" ) !element.hasAttribute( "data-html2canvas-ignore" )
); );
}; };
_html2canvas.Util.trimText = (function(native){ _html2canvas.Util.trimText = (function(native){
return function(input){ return function(input){
if(native) { return native.apply( input ); } if(native) { return native.apply( input ); }
else { return ((input || '') + '').replace( /^\s+|\s+$/g , '' ); } else { return ((input || '') + '').replace( /^\s+|\s+$/g , '' ); }
@ -31,7 +31,7 @@ _html2canvas.Util.trimText = (function(native){
_html2canvas.Util.parseBackgroundImage = function (value) { _html2canvas.Util.parseBackgroundImage = function (value) {
var whitespace = ' \r\n\t', var whitespace = ' \r\n\t',
method, definition, prefix, prefix_i, block, results = [], method, definition, prefix, prefix_i, block, results = [],
c, mode = 0, numParen = 0, quote, args; c, mode = 0, numParen = 0, quote, args;
var appendResult = function(){ var appendResult = function(){
@ -42,7 +42,7 @@ _html2canvas.Util.parseBackgroundImage = function (value) {
if(definition) { if(definition) {
args.push(definition); args.push(definition);
} }
if(method.substr( 0, 1 ) === '-' && if(method.substr( 0, 1 ) === '-' &&
(prefix_i = method.indexOf( '-', 1 ) + 1) > 0) { (prefix_i = method.indexOf( '-', 1 ) + 1) > 0) {
prefix = method.substr( 0, prefix_i); prefix = method.substr( 0, prefix_i);
method = method.substr( prefix_i ); method = method.substr( prefix_i );
@ -55,7 +55,7 @@ _html2canvas.Util.parseBackgroundImage = function (value) {
}); });
} }
args = []; //for some odd reason, setting .length = 0 didn't work in safari args = []; //for some odd reason, setting .length = 0 didn't work in safari
method = method =
prefix = prefix =
definition = definition =
block = ''; block = '';
@ -69,9 +69,9 @@ _html2canvas.Util.parseBackgroundImage = function (value) {
} }
switch(c) { switch(c) {
case '"': case '"':
if(!quote) { if(!quote) {
quote = c; quote = c;
} }
else if(quote === c) { else if(quote === c) {
quote = null; quote = null;
} }
@ -96,8 +96,8 @@ _html2canvas.Util.parseBackgroundImage = function (value) {
block += c; block += c;
appendResult(); appendResult();
continue; continue;
} else { } else {
numParen--; numParen--;
} }
} }
break; break;
@ -196,25 +196,24 @@ _html2canvas.Util.getCSS = function (el, attribute, index) {
return val; return val;
} }
if ( window.getComputedStyle ) { if (previousElement !== el) {
if ( previousElement !== el ) {
computedCSS = document.defaultView.getComputedStyle(el, null); computedCSS = document.defaultView.getComputedStyle(el, null);
} }
val = computedCSS[ attribute ]; val = computedCSS[attribute];
if ( isBackgroundSizePosition ) { if (isBackgroundSizePosition) {
val = (val || '').split( ',' ); val = (val || '').split( ',' );
val = val[index || 0] || val[0] || 'auto'; val = val[index || 0] || val[0] || 'auto';
val = _html2canvas.Util.trimText( val ).split( ' ' ); val = _html2canvas.Util.trimText(val).split(' ');
if(attribute === 'backgroundSize' && (!val[ 0 ] || val[ 0 ].match( /cover|contain|auto/ ))) { if(attribute === 'backgroundSize' && (!val[ 0 ] || val[ 0 ].match( /cover|contain|auto/ ))) {
//these values will be handled in the parent function //these values will be handled in the parent function
} else { } else {
val[ 0 ] = ( val[ 0 ].indexOf( "%" ) === -1 ) ? toPX( attribute + "X", val[ 0 ] ) : val[ 0 ]; val[ 0 ] = ( val[ 0 ].indexOf( "%" ) === -1 ) ? toPX( attribute + "X", val[ 0 ] ) : val[ 0 ];
if(val[ 1 ] === undefined) { if(val[ 1 ] === undefined) {
if(attribute === 'backgroundSize') { if(attribute === 'backgroundSize') {
val[ 1 ] = 'auto'; val[ 1 ] = 'auto';
return val; return val;
} }
else { else {
@ -234,31 +233,6 @@ _html2canvas.Util.getCSS = function (el, attribute, index) {
val = arr; val = arr;
} }
} else if ( el.currentStyle ) {
// IE 9>
if ( isBackgroundSizePosition ) {
// Older IE uses -x and -y
val = [ toPX( attribute + "X", el.currentStyle[ attribute + "X" ] ), toPX( attribute + "Y", el.currentStyle[ attribute + "Y" ] ) ];
} else {
val = toPX( attribute, el.currentStyle[ attribute ] );
if (/^(border)/i.test( attribute ) && /^(medium|thin|thick)$/i.test( val )) {
switch (val) {
case "thin":
val = "1px";
break;
case "medium":
val = "0px"; // this is wrong, it should be 3px but IE uses medium for no border as well.. TODO find a work around
break;
case "thick":
val = "5px";
break;
}
}
}
}
return val; return val;
}; };
@ -309,8 +283,8 @@ function backgroundBoundsFactory( prop, el, bounds, image, imageIndex, backgroun
} else { } else {
if(prop === 'backgroundSize') { if(prop === 'backgroundSize') {
if(bgposition[0] === 'auto') { if(bgposition[0] === 'auto') {
left = image.width; left = image.width;
} else { } else {
if(bgposition[0].match(/contain|cover/)) { if(bgposition[0].match(/contain|cover/)) {
@ -327,9 +301,9 @@ function backgroundBoundsFactory( prop, el, bounds, image, imageIndex, backgroun
} }
} }
if(bgposition[1] === 'auto') { if(bgposition[1] === 'auto') {
topPos = left / image.width * image.height; topPos = left / image.width * image.height;
} else if (bgposition[1].toString().indexOf("%") !== -1){ } else if (bgposition[1].toString().indexOf("%") !== -1){
percentage = (parseFloat(bgposition[1])/100); percentage = (parseFloat(bgposition[1])/100);
topPos = bounds.height * percentage; topPos = bounds.height * percentage;