ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-30 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix uses of innerHtml when we could just set element text (#1919)

Browse Source
This commit is contained in:
Matt Irvine
2018-07-13 15:24:24 -07:00
committed by GitHub
parent 1327120024
commit fd49c081c2
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/base/browser/ui/modal/dialogHelper.ts
View File

@@ -17,7 +17,7 @@ export function appendRow(container: Builder, label: string, labelClass: string,
container.element('tr', {}, (rowContainer) => {
rowContainer.element('td', { class: labelClass }, (labelCellContainer) => {
labelCellContainer.div({}, (labelContainer) => {
labelContainer.innerHtml(label);
labelContainer.text(label);
});
});
rowContainer.element('td', { class: cellContainerClass }, (inputCellContainer) => {

4
src/sql/base/browser/ui/modal/modal.ts
View File

@@ -170,7 +170,7 @@ export abstract class Modal extends Disposable implements IThemable {
}
modalHeader.div({ class: 'modal-title' }, (modalTitle) => {
this._modalTitle = modalTitle;
modalTitle.innerHtml(this._title);
modalTitle.text(this._title);
});
});
parts.push(this._modalHeaderSection.getHTMLElement());
@@ -433,7 +433,7 @@ export abstract class Modal extends Disposable implements IThemable {
*/
protected set title(title: string) {
if (this._title !== undefined) {
this._modalTitle.innerHtml(title);
this._modalTitle.text(title);
}
}

2
src/sql/parts/accountManagement/accountDialog/accountDialog.ts
View File

@@ -131,7 +131,7 @@ export class AccountDialog extends Modal {
this._noaccountViewContainer = DOM.$('div.no-account-view');
let noAccountTitle = DOM.append(this._noaccountViewContainer, DOM.$('.no-account-view-label'));
let noAccountLabel = localize('accountDialog.noAccountLabel', 'There is no linked account. Please add an account.');
noAccountTitle.innerHTML = noAccountLabel;
noAccountTitle.innerText = noAccountLabel;
// Show the add account button for the first provider
// Todo: If we have more than 1 provider, need to show all add account buttons for all providers

6
src/sql/parts/connection/connectionDialog/connectionDialogService.ts
View File

@@ -339,9 +339,9 @@ export class ConnectionDialogService implements IConnectionDialogService {
if (!platform.isWindows && types.isString(message) && message.toLowerCase().includes('kerberos') && message.toLowerCase().includes('kinit')) {
message = [
localize('kerberosErrorStart', "Connection failed due to Kerberos error."),
localize('kerberosHelpLink', " Help configuring Kerberos is available at ") + helpLink,
localize('kerberosKinit', " If you have previously connected you may need to re-run kinit.")
].join('<br/>');
localize('kerberosHelpLink', "Help configuring Kerberos is available at {0}", helpLink),
localize('kerberosKinit', "If you have previously connected you may need to re-run kinit.")
].join('\r\n');
actions.push(new Action('Kinit', 'Run kinit', null, true, () => {
this._connectionDialog.close();
this._clipboardService.writeText('kinit\r');

2
src/sql/parts/dashboard/containers/dashboardErrorContainer.component.ts
View File

@@ -40,7 +40,7 @@ export class DashboardErrorContainer extends DashboardTab implements AfterViewIn
ngAfterViewInit() {
let errorMessage = this._errorMessageContainer.nativeElement as HTMLElement;
errorMessage.innerHTML = nls.localize('dashboardNavSection_loadTabError', 'The "{0}" section has invalid content. Please contact extension owner.', this.tab.title);
errorMessage.innerText = nls.localize('dashboardNavSection_loadTabError', 'The "{0}" section has invalid content. Please contact extension owner.', this.tab.title);
}
public get id(): string {

4
src/sql/workbench/errorMessageDialog/errorMessageDialog.ts
View File

@@ -101,7 +101,7 @@ export class ErrorMessageDialog extends Modal {
private updateDialogBody(): void {
let builder = new Builder(this._body).empty();
builder.div({ class: 'error-message' }, (errorContainer) => {
errorContainer.innerHtml(this._message);
errorContainer.getHTMLElement().innerText = this._message;
});
}
@@ -168,7 +168,7 @@ export class ErrorMessageDialog extends Modal {
private resetActions(): void {
this._actions = [];
for(let actionButton of this._actionButtons) {
for (let actionButton of this._actionButtons) {
actionButton.element.style.visibility = 'hidden';
}
}