From 7900866a834e2abda63d47485010cb516f4844ee Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 12 Aug 2016 13:09:04 +0200
Subject: [PATCH] debt - remove unused stuff, modernize code

---
 src/vs/base/browser/ui/actionbar/actionbar.ts | 27 +++++--------------
 src/vs/base/common/events.ts                  |  1 -
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
index 814b0d0cedf..842a44cf9d1 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.ts
+++ b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -355,9 +355,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
 
 	private toDispose: lifecycle.IDisposable[];
 
-	constructor(container: HTMLElement, options?: IActionBarOptions);
-	constructor(container: Builder, options?: IActionBarOptions);
-	constructor(container: any, options: IActionBarOptions = defaultOptions) {
+	constructor(container: HTMLElement | Builder, options: IActionBarOptions = defaultOptions) {
 		super();
 		this.options = options;
 		this._context = options.context;
@@ -449,8 +447,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
 
 		this.domNode.appendChild(this.actionsList);
 
-		container = (container instanceof Builder) ? container.getHTMLElement() : container;
-		container.appendChild(this.domNode);
+		((container instanceof Builder) ? container.getHTMLElement() : container).appendChild(this.domNode);
 	}
 
 	public setAriaLabel(label: string): void {
@@ -495,17 +492,14 @@ export class ActionBar extends EventEmitter implements IActionRunner {
 		return $(this.domNode);
 	}
 
-	public push(actions: IAction, options?: IActionOptions): void;
-	public push(actions: IAction[], options?: IActionOptions): void;
-	public push(actions: any, options: IActionOptions = {}): void {
-		if (!Array.isArray(actions)) {
-			actions = [actions];
-		}
+	public push(arg: IAction | IAction[], options: IActionOptions = {}): void {
+
+		const actions: IAction[] = !Array.isArray(arg) ? [arg] : arg;
 
 		let index = types.isNumber(options.index) ? options.index : null;
 
 		actions.forEach((action: IAction) => {
-			let actionItemElement = document.createElement('li');
+			const actionItemElement = document.createElement('li');
 			actionItemElement.className = 'action-item';
 			actionItemElement.setAttribute('role', 'presentation');
 
@@ -535,10 +529,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
 	}
 
 	public clear(): void {
-		let item: IActionItem;
-		while (item = this.items.pop()) {
-			item.dispose();
-		}
+		this.items = lifecycle.dispose(this.items);
 		$(this.actionsList).empty();
 	}
 
@@ -550,10 +541,6 @@ export class ActionBar extends EventEmitter implements IActionRunner {
 		return this.items.length === 0;
 	}
 
-	public onContentsChange(): void {
-		this.emit(CommonEventType.CONTENTS_CHANGED);
-	}
-
 	public focus(selectFirst?: boolean): void {
 		if (selectFirst && typeof this.focusedItem === 'undefined') {
 			this.focusedItem = 0;
diff --git a/src/vs/base/common/events.ts b/src/vs/base/common/events.ts
index 2bcc8e371da..82997d15554 100644
--- a/src/vs/base/common/events.ts
+++ b/src/vs/base/common/events.ts
@@ -67,7 +67,6 @@ export const EventType = {
 	EXPAND: 'expand',
 	COLLAPSE: 'collapse',
 	TOGGLE: 'toggle',
-	CONTENTS_CHANGED: 'contentsChanged',
 	BEFORE_RUN: 'beforeRun',
 	RUN: 'run',
 	EDIT: 'edit',
-- 
GitLab