提交 59ef2e37 编写于 作者: A annkamsk

Replace `innerHTML` with `innerText` when assigning non-html string

上级 01b092eb
......@@ -187,14 +187,14 @@ class Label {
if (typeof label === 'string') {
if (!this.singleLabel) {
this.container.innerHTML = '';
this.container.innerText = '';
dom.removeClass(this.container, 'multiple');
this.singleLabel = dom.append(this.container, dom.$('a.label-name', { id: options?.domId }));
}
this.singleLabel.textContent = label;
} else {
this.container.innerHTML = '';
this.container.innerText = '';
dom.addClass(this.container, 'multiple');
this.singleLabel = undefined;
......@@ -250,7 +250,7 @@ class LabelWithHighlights {
if (typeof label === 'string') {
if (!this.singleLabel) {
this.container.innerHTML = '';
this.container.innerText = '';
dom.removeClass(this.container, 'multiple');
this.singleLabel = new HighlightedLabel(dom.append(this.container, dom.$('a.label-name', { id: options?.domId })), this.supportCodicons);
}
......@@ -258,7 +258,7 @@ class LabelWithHighlights {
this.singleLabel.set(label, options?.matches, options?.title, options?.labelEscapeNewLines);
} else {
this.container.innerHTML = '';
this.container.innerText = '';
dom.addClass(this.container, 'multiple');
this.singleLabel = undefined;
......
......@@ -170,7 +170,7 @@ export class InputBox extends Widget {
this.maxHeight = typeof this.options.flexibleMaxHeight === 'number' ? this.options.flexibleMaxHeight : Number.POSITIVE_INFINITY;
this.mirror = dom.append(wrapper, $('div.mirror'));
this.mirror.innerHTML = ' ';
this.mirror.innerText = '\u00a0';
this.scrollableElement = new ScrollableElement(this.element, { vertical: ScrollbarVisibility.Auto });
......@@ -529,7 +529,7 @@ export class InputBox extends Widget {
if (mirrorTextContent) {
this.mirror.textContent = value + suffix;
} else {
this.mirror.innerHTML = ' ';
this.mirror.innerText = '\u00a0';
}
this.layout();
......
......@@ -881,7 +881,7 @@ class TypeFilterController<T, TFilterData> implements IDisposable {
this.messageDomNode.textContent = localize('empty', "No elements found");
this._empty = true;
} else {
this.messageDomNode.innerHTML = '';
this.messageDomNode.innerText = '';
this._empty = false;
}
......
......@@ -278,7 +278,7 @@ class QuickInput extends Disposable implements IQuickInput {
if (title && this.ui.title.textContent !== title) {
this.ui.title.textContent = title;
} else if (!title && this.ui.title.innerHTML !== '&nbsp;') {
this.ui.title.innerHTML = '&nbsp;';
this.ui.title.innerText = '\u00a0;';
}
const description = this.getDescription();
if (this.ui.description.textContent !== description) {
......
......@@ -553,7 +553,7 @@ export class IssueReporter extends Disposable {
private clearSearchResults(): void {
const similarIssues = this.getElementById('similar-issues')!;
similarIssues.innerHTML = '';
similarIssues.innerText = '';
this.numberOfSearchResultsDisplayed = 0;
}
......@@ -564,7 +564,7 @@ export class IssueReporter extends Disposable {
window.fetch(`https://api.github.com/search/issues?q=${query}`).then((response) => {
response.json().then(result => {
similarIssues.innerHTML = '';
similarIssues.innerText = '';
if (result && result.items) {
this.displaySearchResults(result.items);
} else {
......
......@@ -267,7 +267,7 @@ class ProcessExplorer {
return;
}
container.innerHTML = '';
container.innerText = '';
this.listeners.clear();
const tableHead = document.createElement('thead');
......
......@@ -194,8 +194,8 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
dom.toggleClass(this.domNodes.element, 'multiple', multiple);
this.keyMultipleSignatures.set(multiple);
this.domNodes.signature.innerHTML = '';
this.domNodes.docs.innerHTML = '';
this.domNodes.signature.innerText = '';
this.domNodes.docs.innerText = '';
const signature = hints.signatures[hints.activeSignature];
if (!signature) {
......
......@@ -373,7 +373,7 @@ class SuggestionDetails {
this.docs.textContent = documentation;
} else {
this.docs.classList.add('markdown-docs');
this.docs.innerHTML = '';
this.docs.innerText = '';
const renderedContents = this.markdownRenderer.render(documentation);
this.renderDisposeable = renderedContents;
this.docs.appendChild(renderedContents.element);
......
......@@ -179,7 +179,7 @@ class ToggleScreencastModeAction extends Action2 {
|| length > 20
|| event.keyCode === KeyCode.Backspace || event.keyCode === KeyCode.Escape
) {
keyboardMarker.innerHTML = '';
keyboardMarker.innerText = '';
length = 0;
}
......
......@@ -58,7 +58,7 @@ class GridWidgetView<T extends IView> implements IView {
}
set gridWidget(grid: Grid<T> | undefined) {
this.element.innerHTML = '';
this.element.innerText = '';
if (grid) {
this.element.appendChild(grid.element);
......
......@@ -506,7 +506,7 @@ export abstract class ViewPane extends Pane implements IView {
if (!this.shouldShowWelcome()) {
removeClass(this.bodyContainer, 'welcome');
this.viewWelcomeContainer.innerHTML = '';
this.viewWelcomeContainer.innerText = '';
this.scrollableElement.scanDomNode();
return;
}
......@@ -515,14 +515,14 @@ export abstract class ViewPane extends Pane implements IView {
if (contents.length === 0) {
removeClass(this.bodyContainer, 'welcome');
this.viewWelcomeContainer.innerHTML = '';
this.viewWelcomeContainer.innerText = '';
this.scrollableElement.scanDomNode();
return;
}
const disposables = new DisposableStore();
addClass(this.bodyContainer, 'welcome');
this.viewWelcomeContainer.innerHTML = '';
this.viewWelcomeContainer.innerText = '';
let buttonIndex = 0;
......
......@@ -120,7 +120,7 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
renderElement(node: ITreeNode<CommentNode>, index: number, templateData: ICommentThreadTemplateData, height: number | undefined): void {
templateData.userName.textContent = node.element.comment.userName;
templateData.commentText.innerHTML = '';
templateData.commentText.innerText = '';
const disposables = new DisposableStore();
templateData.disposables.push(disposables);
const renderedComment = renderMarkdown(node.element.comment.body, {
......
......@@ -429,7 +429,7 @@ export class ExtensionEditor extends BaseEditor {
}
this.setSubText(extension, reloadAction, template);
template.content.innerHTML = ''; // Clear content before setting navbar actions.
template.content.innerText = ''; // Clear content before setting navbar actions.
template.navbar.clear();
......@@ -560,7 +560,7 @@ export class ExtensionEditor extends BaseEditor {
}
this.contentDisposables.clear();
template.content.innerHTML = '';
template.content.innerText = '';
this.activeElement = null;
if (id) {
this.open(id, extension, template)
......
......@@ -55,7 +55,7 @@ export class InstallCountWidget extends ExtensionWidget {
}
render(): void {
this.container.innerHTML = '';
this.container.innerText = '';
if (!this.extension) {
return;
......@@ -105,7 +105,7 @@ export class RatingsWidget extends ExtensionWidget {
}
render(): void {
this.container.innerHTML = '';
this.container.innerText = '';
if (!this.extension) {
return;
......
......@@ -438,7 +438,7 @@ export class MarkdownCellRenderer extends AbstractCellRenderer implements IListR
templateData.currentRenderedCell = element;
templateData.currentEditor = undefined;
templateData.editorPart!.style.display = 'none';
templateData.cellContainer.innerHTML = '';
templateData.cellContainer.innerText = '';
let renderedHTML = element.getHTML();
if (renderedHTML) {
templateData.cellContainer.appendChild(renderedHTML);
......@@ -1109,7 +1109,7 @@ export class CodeCellRenderer extends AbstractCellRenderer implements IListRende
return;
}
templateData.outputContainer.innerHTML = '';
templateData.outputContainer.innerText = '';
const elementDisposables = templateData.elementDisposables;
......@@ -1256,7 +1256,7 @@ export class RunStateRenderer {
}
}, RunStateRenderer.MIN_SPINNER_TIME);
} else {
this.element.innerHTML = '';
this.element.innerText = '';
}
}
}
......@@ -176,7 +176,7 @@ export class StatefulMarkdownCell extends Disposable {
const lineHeight = this.viewCell.layoutInfo.fontInfo?.lineHeight || 17;
editorHeight = Math.max(lineNum, 1) * lineHeight + EDITOR_TOP_PADDING + EDITOR_BOTTOM_PADDING;
this.templateData.editorContainer.innerHTML = '';
this.templateData.editorContainer.innerText = '';
// create a special context key service that set the inCompositeEditor-contextkey
const editorContextKeyService = this.contextKeyService.createScoped();
......@@ -239,7 +239,7 @@ export class StatefulMarkdownCell extends Disposable {
this.renderedEditors.delete(this.viewCell);
this.markdownContainer.innerHTML = '';
this.markdownContainer.innerText = '';
this.viewCell.clearHTML();
let markdownRenderer = this.viewCell.getMarkdownRenderer();
let renderedHTML = this.viewCell.getHTML();
......@@ -259,7 +259,7 @@ export class StatefulMarkdownCell extends Disposable {
}));
this.localDisposables.add(this.viewCell.textBuffer.onDidChangeContent(() => {
this.markdownContainer.innerHTML = '';
this.markdownContainer.innerText = '';
this.viewCell.clearHTML();
let renderedHTML = this.viewCell.getHTML();
if (renderedHTML) {
......@@ -310,7 +310,7 @@ export class StatefulMarkdownCell extends Disposable {
setFoldingIndicator() {
switch (this.foldingState) {
case CellFoldingState.None:
this.templateData.foldingIndicator.innerHTML = '';
this.templateData.foldingIndicator.innerText = '';
break;
case CellFoldingState.Collapsed:
this.templateData.foldingIndicator.innerHTML = renderCodicons('$(chevron-right)');
......
......@@ -420,7 +420,7 @@ function webviewPreloads() {
case 'clear':
queuedOuputActions.clear(); // stop all loading outputs
onWillDestroyOutput.fire([undefined, undefined]);
document.getElementById('container')!.innerHTML = '';
document.getElementById('container')!.innerText = '';
outputObservers.forEach(ob => {
ob.disconnect();
......
......@@ -636,7 +636,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
template.labelElement.textContent = element.displayLabel;
template.labelElement.title = titleTooltip;
template.descriptionElement.innerHTML = '';
template.descriptionElement.innerText = '';
if (element.setting.descriptionIsMarkdown) {
const disposables = new DisposableStore();
template.toDispose.add(disposables);
......@@ -649,7 +649,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
const baseId = (element.displayCategory + '_' + element.displayLabel).replace(/ /g, '_').toLowerCase();
template.descriptionElement.id = baseId + '_setting_description';
template.otherOverridesElement.innerHTML = '';
template.otherOverridesElement.innerText = '';
template.otherOverridesElement.style.display = 'none';
if (element.overriddenScopeList.length) {
template.otherOverridesElement.style.display = 'inline';
......@@ -686,7 +686,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
if (deprecationText && element.setting.deprecationMessageIsMarkdown) {
const disposables = new DisposableStore();
template.elementDisposables.add(disposables);
template.deprecationWarningElement.innerHTML = '';
template.deprecationWarningElement.innerText = '';
template.deprecationWarningElement.appendChild(this.renderSettingMarkdown(element, element.setting.deprecationMessage!, template.elementDisposables));
} else {
template.deprecationWarningElement.innerText = deprecationText;
......@@ -820,7 +820,7 @@ export class SettingGroupRenderer implements ITreeRenderer<SettingsTreeGroupElem
}
renderElement(element: ITreeNode<SettingsTreeGroupElement, never>, index: number, templateData: IGroupTitleTemplate): void {
templateData.parent.innerHTML = '';
templateData.parent.innerText = '';
const labelElement = DOM.append(templateData.parent, $('div.settings-group-title-label'));
labelElement.classList.add(`settings-group-level-${element.element.level}`);
labelElement.textContent = element.element.label;
......@@ -1365,7 +1365,7 @@ export class SettingEnumRenderer extends AbstractSettingRenderer implements ITre
template.selectBox.select(idx);
template.onChange = idx => onChange(dataElement.setting.enum![idx]);
template.enumDescriptionElement.innerHTML = '';
template.enumDescriptionElement.innerText = '';
}
}
......
......@@ -63,7 +63,7 @@ class MyPart2 extends SimplePart {
const titleContainer = append(parent, $('div'));
const titleLabel = append(titleContainer, $('span'));
titleLabel.id = 'myPart.title';
titleLabel.innerHTML = 'Title';
titleLabel.innerText = 'Title';
return titleContainer;
}
......@@ -72,7 +72,7 @@ class MyPart2 extends SimplePart {
const contentContainer = append(parent, $('div'));
const contentSpan = append(contentContainer, $('span'));
contentSpan.id = 'myPart.content';
contentSpan.innerHTML = 'Content';
contentSpan.innerText = 'Content';
return contentContainer;
}
......@@ -92,7 +92,7 @@ class MyPart3 extends SimplePart {
const contentContainer = append(parent, $('div'));
const contentSpan = append(contentContainer, $('span'));
contentSpan.id = 'myPart.content';
contentSpan.innerHTML = 'Content';
contentSpan.innerText = 'Content';
return contentContainer;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册