Merge branch 'issue681' into develop. Issue #681.
This commit is contained in:
commit
76a4ee314c
|
@ -84,19 +84,22 @@
|
||||||
this.div.style.fontStyle = (font.style||"normal");
|
this.div.style.fontStyle = (font.style||"normal");
|
||||||
}
|
}
|
||||||
var W = this.getComparisonWidths(font.testString,font.noStyleChar);
|
var W = this.getComparisonWidths(font.testString,font.noStyleChar);
|
||||||
|
var found = false;
|
||||||
if (W) {
|
if (W) {
|
||||||
this.div.style.fontFamily = "'"+font.family+"',"+this.comparisonFont[0];
|
this.div.style.fontFamily = "'"+font.family+"',"+this.comparisonFont[0];
|
||||||
if (this.div.offsetWidth == W[0]) {
|
if (this.div.offsetWidth == W[0]) {
|
||||||
this.div.style.fontFamily = "'"+font.family+"',"+this.comparisonFont[W[2]];
|
this.div.style.fontFamily = "'"+font.family+"',"+this.comparisonFont[W[2]];
|
||||||
if (this.div.offsetWidth == W[1]) {return false}
|
if (this.div.offsetWidth == W[1]) {found = true}
|
||||||
}
|
}
|
||||||
if (this.div.offsetWidth != W[3] || this.div.offsetHeight != W[4]) {
|
if (!found && (this.div.offsetWidth != W[3] || this.div.offsetHeight != W[4])) {
|
||||||
if (font.noStyleChar || !HTMLCSS.FONTDATA || !HTMLCSS.FONTDATA.hasStyleChar) {return true}
|
if (!font.noStyleChar && HTMLCSS.FONTDATA && HTMLCSS.FONTDATA.hasStyleChar) {
|
||||||
for (var i = 0, m = this.testSize.length; i < m; i++)
|
for (var i = 0, m = this.testSize.length; i < m; i++)
|
||||||
{if (this.testStyleChar(font,this.testSize[i])) {return true}}
|
{if (this.testStyleChar(font,this.testSize[i])) {found = true; m = 0}}
|
||||||
|
} else {found = true}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
if (HTMLCSS.safariTextNodeBug) {this.div.innerHTML = ""} else {this.text.nodeValue = ""}
|
||||||
|
return found;
|
||||||
},
|
},
|
||||||
|
|
||||||
styleChar: "\uEFFD", // width encodes style
|
styleChar: "\uEFFD", // width encodes style
|
||||||
|
|
Loading…
Reference in New Issue
Block a user