Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-19 14:22:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

tslint

Browse Source
This commit is contained in:
Benjamin Pasero
2016-01-18 18:21:33 +01:00
parent 3298a01494
commit 79e032c169
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/viewlet.ts
+10 -2
View File
@@ -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);
src/vs/workbench/test/browser/servicesTestUtils.ts
+3 -1
View File
@@ -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);
}