ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

dont dispose serverTreeView every time hidden (#5092)

Browse Source
This commit is contained in:
Aditya Bist
2019-04-17 20:12:44 -07:00
committed by GitHub
parent d3483afaed
commit 1fec26c6b3
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts
View File

@@ -56,10 +56,12 @@ export class ConnectionViewletPanel extends ViewletPanel {
this._addServerGroupAction = this.instantiationService.createInstance(AddServerGroupAction, this._addServerGroupAction = this.instantiationService.createInstance(AddServerGroupAction,
AddServerGroupAction.ID, AddServerGroupAction.ID,
AddServerGroupAction.LABEL); AddServerGroupAction.LABEL);
this._serverTreeView = this.instantiationService.createInstance(ServerTreeView); this._serverTreeView = this.objectExplorerService.getServerTreeView();
if (!this._serverTreeView) {
this._serverTreeView = this.instantiationService.createInstance(ServerTreeView);
this.objectExplorerService.registerServerTreeView(this._serverTreeView);
}
this._activeConnectionsFilterAction = this._serverTreeView.activeConnectionsFilterAction; this._activeConnectionsFilterAction = this._serverTreeView.activeConnectionsFilterAction;
this.objectExplorerService.registerServerTreeView(this._serverTreeView);
} }
protected renderHeader(container: HTMLElement): void { protected renderHeader(container: HTMLElement): void {
@@ -127,9 +129,8 @@ export class ConnectionViewletPanel extends ViewletPanel {
} }
dispose(): void { dispose(): void {
this._serverTreeView.dispose();
super.dispose();
this.disposables = dispose(this.disposables); this.disposables = dispose(this.disposables);
super.dispose();
} }
focus(): void { focus(): void {

4
src/sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet.ts
View File

@@ -117,7 +117,9 @@ export class DataExplorerViewlet extends ViewContainerViewlet {
} }
protected createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewletPanel { protected createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewletPanel {
return this.instantiationService.createInstance(viewDescriptor.ctorDescriptor.ctor, options) as ViewletPanel; let viewletPanel = this.instantiationService.createInstance(viewDescriptor.ctorDescriptor.ctor, options) as ViewletPanel;
this._register(viewletPanel);
return viewletPanel;
} }
dispose(): void { dispose(): void {