提交 054343f4 编写于 作者: B Benjamin Pasero

debt - wire in dispose calls properly for workbench list/tree

上级 9a1766c8
......@@ -58,7 +58,7 @@ class PagedRenderer<TElement, TTemplateData> implements IRenderer<number, ITempl
}
}
export class PagedList<T> {
export class PagedList<T> implements IDisposable {
private list: List<number>;
private _model: IPagedModel<T>;
......@@ -185,4 +185,8 @@ export class PagedList<T> {
style(styles: IListStyles): void {
this.list.style(styles);
}
dispose(): void {
this.list.dispose();
}
}
\ No newline at end of file
......@@ -206,10 +206,6 @@ export class WorkbenchList<T> extends List<T> {
this.registerListeners();
}
public get useAltAsMultipleSelectionModifier(): boolean {
return this._useAltAsMultipleSelectionModifier;
}
private registerListeners(): void {
this.disposables.push(this.configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration(multiSelectModifierSettingKey)) {
......@@ -217,6 +213,10 @@ export class WorkbenchList<T> extends List<T> {
}
}));
}
get useAltAsMultipleSelectionModifier(): boolean {
return this._useAltAsMultipleSelectionModifier;
}
}
export class WorkbenchPagedList<T> extends PagedList<T> {
......@@ -252,10 +252,6 @@ export class WorkbenchPagedList<T> extends PagedList<T> {
this.registerListeners();
}
public get useAltAsMultipleSelectionModifier(): boolean {
return this._useAltAsMultipleSelectionModifier;
}
private registerListeners(): void {
this.disposables.push(this.configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration(multiSelectModifierSettingKey)) {
......@@ -264,7 +260,13 @@ export class WorkbenchPagedList<T> extends PagedList<T> {
}));
}
get useAltAsMultipleSelectionModifier(): boolean {
return this._useAltAsMultipleSelectionModifier;
}
dispose(): void {
super.dispose();
this.disposables = dispose(this.disposables);
}
}
......@@ -309,14 +311,6 @@ export class WorkbenchTree extends Tree {
this.registerListeners();
}
public get openOnSingleClick(): boolean {
return this._openOnSingleClick;
}
public get useAltAsMultipleSelectionModifier(): boolean {
return this._useAltAsMultipleSelectionModifier;
}
private registerListeners(): void {
this.disposables.push(this.onDidChangeSelection(() => {
const selection = this.getSelection();
......@@ -335,7 +329,17 @@ export class WorkbenchTree extends Tree {
}));
}
get openOnSingleClick(): boolean {
return this._openOnSingleClick;
}
get useAltAsMultipleSelectionModifier(): boolean {
return this._useAltAsMultipleSelectionModifier;
}
dispose(): void {
super.dispose();
this.disposables = dispose(this.disposables);
}
}
......@@ -400,7 +404,7 @@ export interface IResourceResultsNavigationOptions {
export class TreeResourceNavigator extends Disposable {
private _openResource: Emitter<IOpenResourceOptions> = new Emitter<IOpenResourceOptions>();
public readonly openResource: Event<IOpenResourceOptions> = this._openResource.event;
readonly openResource: Event<IOpenResourceOptions> = this._openResource.event;
constructor(private tree: WorkbenchTree, private options?: IResourceResultsNavigationOptions) {
super();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册