labels - cleanup click handler

src/vs/base/browser/ui/iconLabel/iconLabel.ts

@@ -7,7 +7,7 @@ import 'vs/css!./iconlabel';
 import * as dom from 'vs/base/browser/dom';
 import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { IMatch } from 'vs/base/common/filters';
-import { IDisposable, combinedDisposable, Disposable } from 'vs/base/common/lifecycle';
+import { Disposable } from 'vs/base/common/lifecycle';
 
 export interface IIconLabelCreationOptions {
 	supportHighlights?: boolean;
@@ -116,12 +116,6 @@ export class IconLabel extends Disposable {
 		return this.domNode.element;
 	}
 
-	onClick(callback: (event: MouseEvent) => void): IDisposable {
-		return combinedDisposable([
-			dom.addDisposableListener(this.labelDescriptionContainer.element, dom.EventType.CLICK, (e: MouseEvent) => callback(e)),
-		]);
-	}
-
 	setLabel(label?: string, description?: string, options?: IIconLabelValueOptions): void {
 		const classes = ['monaco-icon-label'];
 		if (options) {

src/vs/workbench/browser/labels.ts

@@ -68,8 +68,6 @@ export interface IResourceLabel extends IDisposable {
 	setEditor(editor: IEditorInput, options?: IResourceLabelOptions): void;
 
 	clear(): void;
-
-	onClick(callback: (event: MouseEvent) => void): IDisposable;
 }
 
 export class ResourceLabels extends Disposable {
@@ -127,7 +125,6 @@ export class ResourceLabels extends Disposable {
 			setEditor: (editor: IEditorInput, options?: IResourceLabelOptions) => widget.setEditor(editor, options),
 			setFile: (resource: uri, options?: IFileLabelOptions) => widget.setFile(resource, options),
 			clear: () => widget.clear(),
-			onClick: (callback: (event: MouseEvent) => void) => widget.onClick(callback),
 			dispose: () => this.disposeWidget(widget)
 		};
 

src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts

@@ -41,7 +41,7 @@ export class NoTabsTitleControl extends TitleControl {
 
 		// Editor Label
 		this.editorLabel = this._register(this.instantiationService.createInstance(ResourceLabel, labelContainer, void 0)).element;
-		this._register(this.editorLabel.onClick(e => this.onTitleLabelClick(e)));
+		this._register(addDisposableListener(this.editorLabel.element, EventType.CLICK, e => this.onTitleLabelClick(e)));
 
 		// Breadcrumbs
 		this.createBreadcrumbsControl(labelContainer, { showFileIcons: false, showSymbolIcons: true, showDecorationColors: false, breadcrumbsBackground: () => Color.transparent });