Merge pull request #1922 from brn/fix-ie7-error
IE7 cause error when accessing the HTMLElement.style.font property.
This commit is contained in:
commit
2cb84b3bc3
1 changed files with 7 additions and 1 deletions
|
|
@ -33,6 +33,7 @@ define(function(require, exports, module) {
|
|||
var oop = require("../lib/oop");
|
||||
var dom = require("../lib/dom");
|
||||
var lang = require("../lib/lang");
|
||||
var useragent = require("../lib/useragent");
|
||||
var EventEmitter = require("../lib/event_emitter").EventEmitter;
|
||||
|
||||
var CHAR_COUNT = 0;
|
||||
|
|
@ -85,7 +86,12 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) {
|
|||
style.visibility = "hidden";
|
||||
style.position = "fixed";
|
||||
style.whiteSpace = "pre";
|
||||
style.font = "inherit";
|
||||
|
||||
if (useragent.isIE < 8) {
|
||||
style["font-family"] = "inherit";
|
||||
} else {
|
||||
style.font = "inherit";
|
||||
}
|
||||
style.overflow = isRoot ? "hidden" : "visible";
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue