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

Merge pull request #2159 from ajaxorg/misc

Browse source 
Fix several small issues
This commit is contained in:
Ruben Daniels 2014-09-20 10:10:04 +02:00
commit 961eee344c
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,7 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) {
document.documentElement.appendChild(el); document.documentElement.appendChild(el);
var w = el.getBoundingClientRect().width; var w = el.getBoundingClientRect().width;
if (w > 0 && w < 1) if (w > 0 && w < 1)
CHAR_COUNT = 1; CHAR_COUNT = 50;
else else
CHAR_COUNT = 100; CHAR_COUNT = 100;
el.parentNode.removeChild(el); el.parentNode.removeChild(el);
@ -127,7 +127,7 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) {
}; };
this.$measureSizes = function() { this.$measureSizes = function() {
if (CHAR_COUNT === 1) { if (CHAR_COUNT === 50) {
var rect = null; var rect = null;
try { try {
rect = this.$measureNode.getBoundingClientRect(); rect = this.$measureNode.getBoundingClientRect();
@ -136,7 +136,7 @@ var FontMetrics = exports.FontMetrics = function(parentEl, interval) {
}; };
var size = { var size = {
height: rect.height, height: rect.height,
width: rect.width width: rect.width / CHAR_COUNT
}; };
} else { } else {
var size = { var size = {

2
lib/ace/mode/html.js
View file

@ -43,7 +43,7 @@ var HtmlCompletions = require("./html_completions").HtmlCompletions;
var WorkerClient = require("../worker/worker_client").WorkerClient; var WorkerClient = require("../worker/worker_client").WorkerClient;
// http://www.w3.org/TR/html5/syntax.html#void-elements // http://www.w3.org/TR/html5/syntax.html#void-elements
var voidElements = ["area", "base", "br", "col", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"]; var voidElements = ["area", "base", "br", "col", "embed", "hr", "img", "input", "keygen", "link", "meta", "menuitem", "param", "source", "track", "wbr"];
var optionalEndTags = ["li", "dt", "dd", "p", "rt", "rp", "optgroup", "option", "colgroup", "td", "th"]; var optionalEndTags = ["li", "dt", "dd", "p", "rt", "rp", "optgroup", "option", "colgroup", "td", "th"];
var Mode = function(options) { var Mode = function(options) {