mirror of
https://github.com/niklasvh/html2canvas.git
synced 2023-08-10 21:13:10 +03:00
Added qunit tests for text-shadow
This commit is contained in:
parent
e1573f8aed
commit
f49e147b2f
27
src/Core.js
27
src/Core.js
@ -20,6 +20,33 @@ _html2canvas.Util.trimText = (function(isNative){
|
||||
};
|
||||
})( String.prototype.trim );
|
||||
|
||||
(function() {
|
||||
|
||||
// TODO: support all possible length values
|
||||
var TEXT_SHADOW_PROPERTY = /((rgba|rgb)\([^\)]+\)(\s-?\d+px){0,})/g;
|
||||
var TEXT_SHADOW_VALUES = /(-?\d+px)|(#.+)|(rgb\(.+\))|(rgba\(.+\))/g;
|
||||
_html2canvas.Util.parseTextShadows = function (value) {
|
||||
if (value === 'none') {
|
||||
return [];
|
||||
}
|
||||
|
||||
// find multiple shadow declarations
|
||||
var shadows = value.match(TEXT_SHADOW_PROPERTY),
|
||||
results = [];
|
||||
for (var i = 0; i < shadows.length; i++) {
|
||||
var s = shadows[i].match(TEXT_SHADOW_VALUES);
|
||||
results.push({
|
||||
color: s[0],
|
||||
offsetX: s[1] ? s[1].replace('px', '') : 0,
|
||||
offsetY: s[2] ? s[2].replace('px', '') : 0,
|
||||
blur: s[3] ? s[3].replace('px', '') : 0
|
||||
});
|
||||
}
|
||||
return results;
|
||||
};
|
||||
})();
|
||||
|
||||
|
||||
_html2canvas.Util.parseBackgroundImage = function (value) {
|
||||
var whitespace = ' \r\n\t',
|
||||
method, definition, prefix, prefix_i, block, results = [],
|
||||
|
23
src/Parse.js
23
src/Parse.js
@ -75,8 +75,6 @@ _html2canvas.Parse = function (images, options) {
|
||||
}
|
||||
}
|
||||
|
||||
var TEXT_SHADOW_PROPERTY = /((rgba|rgb)\([^\)]+\)(\s-?\d+px){0,})/g;
|
||||
var TEXT_SHADOW_VALUES = /(-?\d+px)|(#.+)|(rgb\(.+\))|(rgba\(.+\))/g;
|
||||
function setTextVariables(ctx, el, text_decoration, color) {
|
||||
var align = false,
|
||||
bold = getCSS(el, "fontWeight"),
|
||||
@ -98,21 +96,14 @@ _html2canvas.Parse = function (images, options) {
|
||||
ctx.setVariable("textAlign", (align) ? "right" : "left");
|
||||
|
||||
if (shadow !== "none") {
|
||||
var shadows = _html2canvas.Util.parseTextShadows(shadow);
|
||||
|
||||
// find multiple shadow declarations
|
||||
var shadows = shadow.match(TEXT_SHADOW_PROPERTY);
|
||||
|
||||
// we'll only support one shadow for now
|
||||
var s = shadows[0].match(TEXT_SHADOW_VALUES),
|
||||
sX = s[1] ? s[1].replace('px', '') : 0,
|
||||
sY = s[2] ? s[2].replace('px', '') : 0,
|
||||
blur = s[3] ? s[3].replace('px', '') : 0;
|
||||
|
||||
// apply the text shadow
|
||||
ctx.setVariable("shadowColor", s[0]);
|
||||
ctx.setVariable("shadowOffsetX", sX);
|
||||
ctx.setVariable("shadowOffsetY", sY);
|
||||
ctx.setVariable("shadowBlur", blur);
|
||||
// TODO: support multiple text shadows
|
||||
// apply the first text shadow
|
||||
ctx.setVariable("shadowColor", shadows[0].color);
|
||||
ctx.setVariable("shadowOffsetX", shadows[0].offsetX);
|
||||
ctx.setVariable("shadowOffsetY", shadows[0].offsetY);
|
||||
ctx.setVariable("shadowBlur", shadows[0].blur);
|
||||
}
|
||||
|
||||
if (text_decoration !== "none"){
|
||||
|
@ -70,6 +70,17 @@
|
||||
<div style="padding: 15% 0 3%;"></div>
|
||||
</div>
|
||||
|
||||
<div id="textShadows">
|
||||
<div style=""></div>
|
||||
<div style="text-shadow: 1px 1px 1px"></div>
|
||||
<div style="text-shadow: 2px 2px rgb(2, 2, 2)"></div>
|
||||
<div style="text-shadow: 3px 3px rgba(2, 2, 2, .2)"></div>
|
||||
<div style="text-shadow: rgb(2, 2, 2) 4px 4px"></div>
|
||||
<div style="text-shadow: rgba(2, 2, 2, .2) 5px 5px"></div>
|
||||
<div style="text-shadow: rgb(2, 2, 2) 6px 6px, #222222 2px 2px"></div>
|
||||
<div style="text-shadow: 7px 7px rgba(2, 2, 2, .2), #222222 2px 2px"></div>
|
||||
</div>
|
||||
|
||||
<div id="backgroundPosition">
|
||||
<div style="background-position: 1px 0;"></div>
|
||||
<div style="background-position: 1em 0;"></div>
|
||||
|
@ -143,7 +143,36 @@ $(function() {
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
test('text-shadow', function() {
|
||||
|
||||
$('#textShadows div').each(function(i, el) {
|
||||
var index = i+1;
|
||||
var value = _html2canvas.Util.getCSS(el, 'textShadow'),
|
||||
shadows = _html2canvas.Util.parseTextShadows(value);
|
||||
if (i == 0) {
|
||||
QUnit.equal(shadows.length, 0, 'div #' + index);
|
||||
} else {
|
||||
QUnit.equal(shadows.length, (i >= 6 ? 2 : 1), 'div #' + index);
|
||||
QUnit.equal(shadows[0].offsetX, i, 'div #' + index + ' offsetX');
|
||||
QUnit.equal(shadows[0].offsetY, i, 'div #' + index + ' offsetY');
|
||||
if (i < 2) {
|
||||
QUnit.equal(shadows[0].color, 'rgba(0, 0, 0, 0)', 'div #' + index + ' color');
|
||||
} else if (i % 2 == 0) {
|
||||
QUnit.equal(shadows[0].color, 'rgb(2, 2, 2)', 'div #' + index + ' color');
|
||||
} else {
|
||||
var opacity = '0.199219';
|
||||
QUnit.equal(shadows[0].color, 'rgba(2, 2, 2, '+opacity+')', 'div #' + index + ' color');
|
||||
}
|
||||
|
||||
// only testing blur once
|
||||
if (i == 1) {
|
||||
QUnit.equal(shadows[0].blur, '1', 'div #' + index + ' blur');
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
test('background-image', function () {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user