From 79e032c1690ed9ae31a2de233a42c2f77dca4a05 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 18 Jan 2016 18:21:33 +0100 Subject: [PATCH] tslint --- src/vs/workbench/browser/viewlet.ts | 12 ++++++++++-- src/vs/workbench/test/browser/servicesTestUtils.ts | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts index 5c04336f1de..b1dd1b97d8a 100644 --- a/src/vs/workbench/browser/viewlet.ts +++ b/src/vs/workbench/browser/viewlet.ts @@ -527,6 +527,8 @@ export class AdaptiveCollapsibleViewletView extends FixedCollapsibleView impleme protected actionRunner: IActionRunner; protected isDisposed: boolean; + private dragHandler: DelayedDragHandler + constructor( actionRunner: IActionRunner, initialBodySize: number, @@ -560,7 +562,7 @@ export class AdaptiveCollapsibleViewletView extends FixedCollapsibleView impleme this.toolBar.setActions(prepareActions(this.getActions()), prepareActions(this.getSecondaryActions()))(); // Expand on drag over - new DelayedDragHandler(container, () => { + this.dragHandler = new DelayedDragHandler(container, () => { if (!this.isExpanded()) { this.expand(); } @@ -629,6 +631,8 @@ export class AdaptiveCollapsibleViewletView extends FixedCollapsibleView impleme this.treeContainer = null; this.tree.dispose(); + this.dragHandler.dispose(); + this.toDispose = disposeAll(this.toDispose); if (this.toolBar) { @@ -648,6 +652,8 @@ export class CollapsibleViewletView extends CollapsibleView implements IViewletV protected actionRunner: IActionRunner; protected isDisposed: boolean; + private dragHandler: DelayedDragHandler; + constructor( actionRunner: IActionRunner, collapsed: boolean, @@ -679,7 +685,7 @@ export class CollapsibleViewletView extends CollapsibleView implements IViewletV this.toolBar.setActions(prepareActions(this.getActions()), prepareActions(this.getSecondaryActions()))(); // Expand on drag over - new DelayedDragHandler(container, () => { + this.dragHandler = new DelayedDragHandler(container, () => { if (!this.isExpanded()) { this.expand(); } @@ -747,6 +753,8 @@ export class CollapsibleViewletView extends CollapsibleView implements IViewletV this.isDisposed = true; this.treeContainer = null; this.tree.dispose(); + + this.dragHandler.dispose(); this.toDispose = disposeAll(this.toDispose); diff --git a/src/vs/workbench/test/browser/servicesTestUtils.ts b/src/vs/workbench/test/browser/servicesTestUtils.ts index c1acb55924d..36539dd3cb8 100644 --- a/src/vs/workbench/test/browser/servicesTestUtils.ts +++ b/src/vs/workbench/test/browser/servicesTestUtils.ts @@ -447,7 +447,9 @@ export class TestQuickOpenService implements QuickOpenService.IQuickOpenService } show(prefix?: string, quickNavigateConfiguration?: any): Promise { - this.callback && this.callback(prefix); + if (this.callback) { + this.callback(prefix); + } return Promise.as(true); }