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

move setInnerHtml to pilot/dom

Browse source
This commit is contained in:
Fabian Jakobs 2011-01-10 10:13:02 +01:00
commit 4ca58558f1
4 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/ace/layer/gutter.js
View file

@ -37,6 +37,8 @@
define(function(require, exports, module) { define(function(require, exports, module) {
var dom = require("pilot/dom");
var Gutter = function(parentEl) { var Gutter = function(parentEl) {
this.element = document.createElement("div"); this.element = document.createElement("div");
this.element.className = "ace_layer ace_gutter-layer"; this.element.className = "ace_layer ace_gutter-layer";
@ -74,13 +76,8 @@ var Gutter = function(parentEl) {
"' style='height:", config.lineHeight, "px;'>", (i+1), "</div>"); "' style='height:", config.lineHeight, "px;'>", (i+1), "</div>");
html.push("</div>"); html.push("</div>");
} }
var element = document.createElement("div"); this.element = dom.setInnerHtml(this.element, html.join(""));
element.className = "ace_layer ace_gutter-layer";
element.innerHTML = html.join("");
this.element.parentNode.replaceChild(element,this.element)
this.element=element
this.element.style.height = config.minHeight + "px"; this.element.style.height = config.minHeight + "px";
}; };
}).call(Gutter.prototype); }).call(Gutter.prototype);

3
lib/ace/layer/marker.js
View file

@ -38,6 +38,7 @@
define(function(require, exports, module) { define(function(require, exports, module) {
var Range = require("ace/range").Range; var Range = require("ace/range").Range;
var dom = require("pilot/dom");
var Marker = function(parentEl) { var Marker = function(parentEl) {
this.element = document.createElement("div"); this.element = document.createElement("div");
@ -97,7 +98,7 @@ var Marker = function(parentEl) {
this.drawSingleLineMarker(html, range, marker.clazz, config); this.drawSingleLineMarker(html, range, marker.clazz, config);
} }
} }
this.element.innerHTML = html.join(""); this.element = dom.setInnerHtml(this.element, html.join(""));
}; };
this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) { this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {

10
lib/ace/layer/text.js
View file

@ -165,7 +165,7 @@ var Text = function(parentEl) {
var html = []; var html = [];
_self.$renderLine(html, i, tokens[i-first].tokens); _self.$renderLine(html, i, tokens[i-first].tokens);
lineElement.innerHTML = html.join(""); dom.setInnerHtml(lineElement, html.join);
} }
}); });
}; };
@ -231,6 +231,7 @@ var Text = function(parentEl) {
var html = []; var html = [];
_self.$renderLine(html, row, tokens[row-firstRow].tokens); _self.$renderLine(html, row, tokens[row-firstRow].tokens);
// don't use setInnerHtml since we are working with an empty DIV
lineEl.innerHTML = html.join(""); lineEl.innerHTML = html.join("");
fragment.appendChild(lineEl); fragment.appendChild(lineEl);
} }
@ -251,12 +252,7 @@ var Text = function(parentEl) {
_self.$renderLine(html, i, tokens[i-config.firstRow].tokens), html.push("</div>"); _self.$renderLine(html, i, tokens[i-config.firstRow].tokens), html.push("</div>");
} }
_self.element = dom.setInnerHtml(_self.element, html.join(""));
var element = document.createElement("div");
element.className = "ace_layer ace_text-layer";
element.innerHTML = html.join("");
_self.element.parentNode.replaceChild(element,_self.element)
_self.element=element
}); });
}; };

2
support/cockpit

@ -1 +1 @@
Subproject commit 6024eafb2559208e8f439d6f25a609d8c020d214 Subproject commit 4fe1c8a835f81f32402b7c81a598abc7009b59be