Skip to content

Commit 68f4d1e

Browse files
joaomorenojoaomoreno
committed
streamline lifecycle methods
1 parent 0f5937c commit 68f4d1e

107 files changed

Lines changed: 252 additions & 265 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/vs/base/browser/builder.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import 'vs/css!./builder';
88
import {TPromise} from 'vs/base/common/winjs.base';
99
import types = require('vs/base/common/types');
10-
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
10+
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
1111
import strings = require('vs/base/common/strings');
1212
import assert = require('vs/base/common/assert');
1313
import DOM = require('vs/base/browser/dom');
@@ -627,11 +627,11 @@ export class Builder implements IDisposable {
627627
let type = arg1;
628628
if (useCapture) {
629629
if (this.captureToUnbind[type]) {
630-
this.captureToUnbind[type] = disposeAll(this.captureToUnbind[type]);
630+
this.captureToUnbind[type] = dispose(this.captureToUnbind[type]);
631631
}
632632
} else {
633633
if (this.toUnbind[type]) {
634-
this.toUnbind[type] = disposeAll(this.toUnbind[type]);
634+
this.toUnbind[type] = dispose(this.toUnbind[type]);
635635
}
636636
}
637637
}
@@ -1769,13 +1769,13 @@ export class Builder implements IDisposable {
17691769

17701770
for (type in this.toUnbind) {
17711771
if (this.toUnbind.hasOwnProperty(type) && types.isArray(this.toUnbind[type])) {
1772-
this.toUnbind[type] = disposeAll(this.toUnbind[type]);
1772+
this.toUnbind[type] = dispose(this.toUnbind[type]);
17731773
}
17741774
}
17751775

17761776
for (type in this.captureToUnbind) {
17771777
if (this.captureToUnbind.hasOwnProperty(type) && types.isArray(this.captureToUnbind[type])) {
1778-
this.captureToUnbind[type] = disposeAll(this.captureToUnbind[type]);
1778+
this.captureToUnbind[type] = dispose(this.captureToUnbind[type]);
17791779
}
17801780
}
17811781

‎src/vs/base/browser/globalMouseMoveMonitor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import {Disposable, IDisposable, disposeAll} from 'vs/base/common/lifecycle';
7+
import {Disposable, IDisposable, dispose} from 'vs/base/common/lifecycle';
88
import * as dom from 'vs/base/browser/dom';
99
import {IframeUtils} from 'vs/base/browser/iframe';
1010
import {StandardMouseEvent} from 'vs/base/browser/mouseEvent';
@@ -64,7 +64,7 @@ export class GlobalMouseMoveMonitor<R> extends Disposable {
6464
}
6565

6666
// Unhook
67-
this.hooks = disposeAll(this.hooks);
67+
this.hooks = dispose(this.hooks);
6868
this.mouseMoveEventMerger = null;
6969
this.mouseMoveCallback = null;
7070
let onStopCallback = this.onStopCallback;

‎src/vs/base/browser/touch.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict';
66

77
import arrays = require('vs/base/common/arrays');
8-
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
8+
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
99
import DomUtils = require('vs/base/browser/dom');
1010

1111
export namespace EventType {
@@ -90,7 +90,7 @@ export class Gesture implements IDisposable {
9090
}
9191

9292
public set target(element: HTMLElement) {
93-
this.callOnTarget = disposeAll(this.callOnTarget);
93+
this.callOnTarget = dispose(this.callOnTarget);
9494

9595
this.activeTouches = {};
9696

‎src/vs/base/browser/ui/actionbar/actionbar.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
712712
this.focusTracker = null;
713713
}
714714

715-
this.toDispose = lifecycle.disposeAll(this.toDispose);
715+
this.toDispose = lifecycle.dispose(this.toDispose);
716716

717717
this.getContainer().destroy();
718718

@@ -792,7 +792,7 @@ export class SelectActionItem extends BaseActionItem {
792792
}
793793

794794
public dispose(): void {
795-
this.toDispose = lifecycle.disposeAll(this.toDispose);
795+
this.toDispose = lifecycle.dispose(this.toDispose);
796796

797797
super.dispose();
798798
}

‎src/vs/base/browser/ui/contextview/contextview.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import 'vs/css!./contextview';
1010
import {Builder, $} from 'vs/base/browser/builder';
1111
import DOM = require('vs/base/browser/dom');
12-
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
12+
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
1313
import {EventEmitter} from 'vs/base/common/eventEmitter';
1414

1515
export interface IAnchor {
@@ -251,6 +251,6 @@ export class ContextView extends EventEmitter {
251251
super.dispose();
252252
this.hide();
253253

254-
this.toDispose = disposeAll(this.toDispose);
254+
this.toDispose = dispose(this.toDispose);
255255
}
256256
}

‎src/vs/base/browser/ui/dropdown/dropdown.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {Gesture, EventType} from 'vs/base/browser/touch';
1212
import {ActionRunner, IAction} from 'vs/base/common/actions';
1313
import {ActionItem, IActionItem} from 'vs/base/browser/ui/actionbar/actionbar';
1414
import {EventEmitter} from 'vs/base/common/eventEmitter';
15-
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
15+
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
1616
import {IContextViewProvider} from 'vs/base/browser/ui/contextview/contextview';
1717
import {IMenuOptions} from 'vs/base/browser/ui/menu/menu';
1818

@@ -120,7 +120,7 @@ export class BaseDropdown extends ActionRunner {
120120
super.dispose();
121121
this.hide();
122122

123-
this.toDispose = disposeAll(this.toDispose);
123+
this.toDispose = dispose(this.toDispose);
124124

125125
if (this.$boxContainer) {
126126
this.$boxContainer.destroy();

‎src/vs/base/browser/ui/list/listView.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IScrollable } from 'vs/base/common/scrollable';
77
import { Emitter } from 'vs/base/common/event';
88
import { toObject, assign } from 'vs/base/common/objects';
9-
import { IDisposable, disposeAll } from 'vs/base/common/lifecycle';
9+
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
1010
import { Gesture } from 'vs/base/browser/touch';
1111
import * as DOM from 'vs/base/browser/dom';
1212
import { IScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
@@ -350,6 +350,6 @@ export class ListView<T> implements IScrollable, IDisposable {
350350
this._domNode = null;
351351
}
352352

353-
this.toDispose = disposeAll(this.toDispose);
353+
this.toDispose = dispose(this.toDispose);
354354
}
355355
}

‎src/vs/base/browser/ui/list/listWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import 'vs/css!./list';
7-
import { IDisposable, dispose, disposeAll } from 'vs/base/common/lifecycle';
7+
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
88
import { isNumber } from 'vs/base/common/types';
99
import * as DOM from 'vs/base/browser/dom';
1010
import Event, { Emitter, mapEvent, EventBufferer } from 'vs/base/common/event';
@@ -134,7 +134,7 @@ class Controller<T> implements IDisposable {
134134
}
135135

136136
dispose() {
137-
this.toDispose = disposeAll(this.toDispose);
137+
this.toDispose = dispose(this.toDispose);
138138
}
139139
}
140140

‎src/vs/base/browser/ui/progressbar/progressbar.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import browser = require('vs/base/browser/browser');
1212
import {Builder, $} from 'vs/base/browser/builder';
1313
import DOM = require('vs/base/browser/dom');
1414
import uuid = require('vs/base/common/uuid');
15-
import {IDisposable,disposeAll} from 'vs/base/common/lifecycle';
15+
import {IDisposable,dispose} from 'vs/base/common/lifecycle';
1616

1717
const css_done = 'done';
1818
const css_active = 'active';
@@ -239,6 +239,6 @@ export class ProgressBar {
239239
}
240240

241241
public dispose(): void {
242-
this.toUnbind = disposeAll(this.toUnbind);
242+
this.toUnbind = dispose(this.toUnbind);
243243
}
244244
}

‎src/vs/base/browser/ui/sash/sash.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'use strict';
77

88
import 'vs/css!./sash';
9-
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
9+
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
1010
import {Builder, $} from 'vs/base/browser/builder';
1111
import {isIPad} from 'vs/base/browser/browser';
1212
import types = require('vs/base/common/types');
@@ -188,7 +188,7 @@ export class Sash extends EventEmitter {
188188

189189
listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), EventType.End, (event: GestureEvent) => {
190190
this.emit('end');
191-
disposeAll(listeners);
191+
dispose(listeners);
192192
}));
193193
}
194194

0 commit comments

Comments
 (0)