提交 0a2a1955 编写于 作者: N Niclas van Eyk

made use of _register for disposables

The previous solution involved an own solution with an array of
disposables. The new solution makes use of the _register-method from the
Displosable class.
上级 d0b45d2d
......@@ -47,7 +47,6 @@ import { CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW
import { IPreferencesService, ISearchResult, ISettingsEditorModel, ISettingsEditorOptions, SettingsEditorOptions, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
import { SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
import { Disposable } from 'vscode';
const $ = DOM.$;
......@@ -118,8 +117,6 @@ export class SettingsEditor2 extends BaseEditor {
/** Don't spam warnings */
private hasWarnedMissingSettings: boolean;
private disposables: Disposable[] = [];
constructor(
@ITelemetryService telemetryService: ITelemetryService,
@IConfigurationService private configurationService: IConfigurationService,
......@@ -466,7 +463,7 @@ export class SettingsEditor2 extends BaseEditor {
this.clearFilterLinkContainer.textContent = ' - ';
const clearFilterLink = DOM.append(this.clearFilterLinkContainer, $('a.pointer.prominent', { tabindex: 0 }, localize('clearSearchFilters', 'Clear Filters')));
this.disposables.push(DOM.addDisposableListener(clearFilterLink, DOM.EventType.CLICK, (e: MouseEvent) => {
this._register(DOM.addDisposableListener(clearFilterLink, DOM.EventType.CLICK, (e: MouseEvent) => {
DOM.EventHelper.stop(e, false);
this.clearSearchFilters();
}));
......@@ -477,7 +474,7 @@ export class SettingsEditor2 extends BaseEditor {
clearSearchContainer.textContent = ' - ';
const clearSearch = DOM.append(clearSearchContainer, $('a.pointer.prominent', { tabindex: 0 }, localize('clearSearch', 'Clear Search')));
this.disposables.push(DOM.addDisposableListener(clearSearch, DOM.EventType.CLICK, (e: MouseEvent) => {
this._register(DOM.addDisposableListener(clearSearch, DOM.EventType.CLICK, (e: MouseEvent) => {
DOM.EventHelper.stop(e, false);
this.clearSearchResults();
}));
......@@ -801,11 +798,6 @@ export class SettingsEditor2 extends BaseEditor {
this.telemetryService.publicLog('settingsEditor.settingModified2', data2);
}
dispose() {
this.disposables.forEach(disposable => disposable.dispose());
super.dispose();
}
private render(token: CancellationToken): TPromise<any> {
if (this.input) {
return this.input.resolve()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册