jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1922 from brn/fix-ie7-error

Browse source 
IE7 cause error when accessing the HTMLElement.style.font property.
This commit is contained in:
Harutyun Amirjanyan 2014-05-21 14:25:26 +02:00
commit 2cb84b3bc3
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ace/layer/font_metrics.js
View file

@ -33,6 +33,7 @@ define(function(require, exports, module) {
var oop = require("../lib/oop"); var oop = require("../lib/oop");
var dom = require("../lib/dom"); var dom = require("../lib/dom");
var lang = require("../lib/lang"); var lang = require("../lib/lang");
var useragent = require("../lib/useragent");
var EventEmitter = require("../lib/event_emitter").EventEmitter; var EventEmitter = require("../lib/event_emitter").EventEmitter;
var CHAR_COUNT = 0; var CHAR_COUNT = 0;
@ -85,7 +86,12 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) {
style.visibility = "hidden"; style.visibility = "hidden";
style.position = "fixed"; style.position = "fixed";
style.whiteSpace = "pre"; style.whiteSpace = "pre";
style.font = "inherit";
if (useragent.isIE < 8) {
style["font-family"] = "inherit";
} else {
style.font = "inherit";
}
style.overflow = isRoot ? "hidden" : "visible"; style.overflow = isRoot ? "hidden" : "visible";
}; };