From 2566dd74a53a5e17fcc8335b7777e4e99c3ae7fd Mon Sep 17 00:00:00 2001 From: brn Date: Tue, 22 Apr 2014 10:56:52 +0900 Subject: [PATCH 1/3] fix style.font property. --- lib/ace/layer/font_metrics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ace/layer/font_metrics.js b/lib/ace/layer/font_metrics.js index a65e100d..89985117 100644 --- a/lib/ace/layer/font_metrics.js +++ b/lib/ace/layer/font_metrics.js @@ -85,7 +85,7 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) { style.visibility = "hidden"; style.position = "fixed"; style.whiteSpace = "pre"; - style.font = "inherit"; + style['font-family'] = style['font-style'] = style['font-weight'] = 'inherit'; style.overflow = isRoot ? "hidden" : "visible"; }; From 31c2978ca71a02cbf58bbdaa5556c2e46ab4a81b Mon Sep 17 00:00:00 2001 From: brn Date: Tue, 22 Apr 2014 11:32:33 +0900 Subject: [PATCH 2/3] fix IE7 style.font property access. add ie check. --- lib/ace/layer/font_metrics.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/ace/layer/font_metrics.js b/lib/ace/layer/font_metrics.js index 89985117..8fe02a33 100644 --- a/lib/ace/layer/font_metrics.js +++ b/lib/ace/layer/font_metrics.js @@ -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-family'] = style['font-style'] = style['font-weight'] = 'inherit'; + + if (useragent.isIE < 8) { + style['font-family'] = 'inherit'; + } else { + style.font = 'inherit'; + } style.overflow = isRoot ? "hidden" : "visible"; }; From 2d39aca4a73b228cb88a09281575584cc19a3c01 Mon Sep 17 00:00:00 2001 From: brn Date: Wed, 21 May 2014 09:27:10 +0900 Subject: [PATCH 3/3] fix code style. --- lib/ace/layer/font_metrics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ace/layer/font_metrics.js b/lib/ace/layer/font_metrics.js index 8fe02a33..a1423732 100644 --- a/lib/ace/layer/font_metrics.js +++ b/lib/ace/layer/font_metrics.js @@ -88,9 +88,9 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) { style.whiteSpace = "pre"; if (useragent.isIE < 8) { - style['font-family'] = 'inherit'; + style["font-family"] = "inherit"; } else { - style.font = 'inherit'; + style.font = "inherit"; } style.overflow = isRoot ? "hidden" : "visible"; };