open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removing a few more innerHTMLs

Browse Source
This commit is contained in:
Jeremy Schomery 2017-07-19 16:04:31 +04:30 committed by tophf
parent 12d67fda6c
commit 0955fc852c
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
edit/edit.js
View File

@ -1088,9 +1088,9 @@ function renderLintReport(someBlockChanged) {
let issueCount = 0; let issueCount = 0;
editors.forEach((cm, index) => { editors.forEach((cm, index) => {
if (cm.state.lint && cm.state.lint.html) { if (cm.state.lint && cm.state.lint.html) {
const newBlock = newContent.appendChild(document.createElement('table'));
const html = '<caption>' + label + ' ' + (index + 1) + '</caption>' + cm.state.lint.html; const html = '<caption>' + label + ' ' + (index + 1) + '</caption>' + cm.state.lint.html;
newBlock.innerHTML = html; const newBlock = newContent.appendChild(tHTML(html, 'table'));
newBlock.cm = cm; newBlock.cm = cm;
issueCount += newBlock.rows.length; issueCount += newBlock.rows.length;
@ -1535,7 +1535,7 @@ function fromMozillaFormat() {
<button name="import-append" i18n-text="importAppendLabel" i18n-title="importAppendTooltip"></button> <button name="import-append" i18n-text="importAppendLabel" i18n-title="importAppendTooltip"></button>
<button name="import-replace" i18n-text="importReplaceLabel" i18n-title="importReplaceTooltip"></button> <button name="import-replace" i18n-text="importReplaceLabel" i18n-title="importReplaceTooltip"></button>
</div>` </div>`
).innerHTML); ));
const contents = popup.querySelector('.contents'); const contents = popup.querySelector('.contents');
contents.insertBefore(popup.codebox.display.wrapper, contents.firstElementChild); contents.insertBefore(popup.codebox.display.wrapper, contents.firstElementChild);
@ -1753,12 +1753,17 @@ function showKeyMapHelp() {
const col = input.parentNode.cellIndex; const col = input.parentNode.cellIndex;
inputs[1 - col].value = ''; inputs[1 - col].value = '';
table.tBodies[0].childNodes.forEach(row => { table.tBodies[0].childNodes.forEach(row => {
let cell = row.children[col]; const cell = row.children[col];
cell.innerHTML = cell.textContent.replace(query, '<mark>$&</mark>'); const html = cell.textContent.replace(query, '<mark>$&</mark>');
cell.textContent = '';
const div = tHTML(html, 'div');
while (div.childNodes.length > 0) {
cell.appendChild(div.childNodes[0]);
}
row.style.display = query.test(cell.textContent) ? '' : 'none'; row.style.display = query.test(cell.textContent) ? '' : 'none';
// clear highlight from the other column // clear highlight from the other column
cell = row.children[1 - col]; // cell = row.children[1 - col];
cell.innerHTML = cell.textContent; // cell.innerHTML = cell.textContent;
}); });
} }
function mergeKeyMaps(merged, ...more) { function mergeKeyMaps(merged, ...more) {
@ -1939,7 +1944,7 @@ function showRegExpTester(event, section = getSectionForChild(this)) {
function showHelp(title, body) { function showHelp(title, body) {
const div = $('#help-popup'); const div = $('#help-popup');
div.classList.remove('big'); div.classList.remove('big');
$('.contents', div).appendChild(tHTML(body)); $('.contents', div).appendChild(typeof body === 'string' ? tHTML(body) : body);
$('.title', div).textContent = title; $('.title', div).textContent = title;
if (getComputedStyle(div).display === 'none') { if (getComputedStyle(div).display === 'none') {

2
js/localization.js
View File

@ -30,7 +30,7 @@ function tE(id, key, attr, esc) {
function tHTML(html, tag) { function tHTML(html, tag) {
// body is a text node without HTML tags // body is a text node without HTML tags
if (typeof html === 'string' && /<\w+/.test(html) === false) { if (typeof html === 'string' && !tag && /<\w+/.test(html) === false) {
return document.createTextNode(html); return document.createTextNode(html);
} }
if (typeof html === 'string') { if (typeof html === 'string') {