Merge from master

src/sql/base/browser/ui/button/button.ts

@@ -7,6 +7,7 @@
 import { Button as vsButton, IButtonOptions, IButtonStyles as vsIButtonStyles } from 'vs/base/browser/ui/button/button';
 import * as DOM from 'vs/base/browser/dom';
 import { Color } from 'vs/base/common/color';
+import { Builder } from 'sql/base/browser/builder';
 
 export interface IButtonStyles extends vsIButtonStyles {
 	buttonFocusOutline?: Color;
@@ -14,10 +15,12 @@ export interface IButtonStyles extends vsIButtonStyles {
 
 export class Button extends vsButton {
 	private buttonFocusOutline: Color;
+	private $el: Builder;
 
-	constructor(container: any, options?: IButtonOptions) {
+	constructor(container: HTMLElement, options?: IButtonOptions) {
 		super(container, options);
 		this.buttonFocusOutline = null;
+		this.$el = new Builder(this.element);
 
 		this.$el.on(DOM.EventType.FOCUS, (e) => {
 			this.$el.style('outline-color', this.buttonFocusOutline ? this.buttonFocusOutline.toString() : null);

src/sql/base/browser/ui/dropdownList/dropdownList.ts

@@ -15,7 +15,7 @@ import { EventType as GestureEventType } from 'vs/base/browser/touch';
 import { List } from 'vs/base/browser/ui/list/listWidget';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { Builder } from 'vs/base/browser/builder';
+import { Builder } from 'sql/base/browser/builder';
 
 import { Button } from 'sql/base/browser/ui/button/button';
 import { attachButtonStyler } from 'sql/platform/theme/common/styler';

src/sql/base/browser/ui/editableDropdown/dropdown.ts

@@ -10,7 +10,7 @@ import { DropdownDataSource, DropdownFilter, DropdownModel, DropdownRenderer, Dr
 
 import { IContextViewProvider, ContextView } from 'vs/base/browser/ui/contextview/contextview';
 import { mixin } from 'vs/base/common/objects';
-import { Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'sql/base/browser/builder';
 import { InputBox, IInputBoxStyles } from 'sql/base/browser/ui/inputBox/inputBox';
 import { IMessage, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IListStyles } from 'vs/base/browser/ui/list/listWidget';

src/sql/base/browser/ui/editableDropdown/dropdownTree.ts

@@ -8,9 +8,9 @@ import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults';
 import { Promise, TPromise } from 'vs/base/common/winjs.base';
 import { generateUuid } from 'vs/base/common/uuid';
 import * as DOM from 'vs/base/browser/dom';
-import { $ } from 'vs/base/browser/builder';
 import { Event, Emitter } from 'vs/base/common/event';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
+import { $ } from 'sql/base/browser/builder';
 
 export interface Template {
 	label: HTMLElement;
@@ -72,7 +72,7 @@ export class DropdownDataSource implements tree.IDataSource {
 		}
 	}
 
-	public getChildren(tree: tree.ITree, element: Resource | DropdownModel): Promise<any, any> {
+	public getChildren(tree: tree.ITree, element: Resource | DropdownModel): Promise<any> {
 		if (element instanceof DropdownModel) {
 			return TPromise.as(this.options);
 		} else {
@@ -80,7 +80,7 @@ export class DropdownDataSource implements tree.IDataSource {
 		}
 	}
 
-	public getParent(tree: tree.ITree, element: Resource | DropdownModel): Promise<any, any> {
+	public getParent(tree: tree.ITree, element: Resource | DropdownModel): Promise<any> {
 		if (element instanceof DropdownModel) {
 			return TPromise.as(undefined);
 		} else {

src/sql/base/browser/ui/panel/panel.component.ts

@@ -18,8 +18,8 @@ import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';
 import * as types from 'vs/base/common/types';
 import { mixin } from 'vs/base/common/objects';
-import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { Disposable } from 'vs/base/common/lifecycle';
+import { ScrollbarVisibility } from 'vs/editor/common/standalone/standaloneEnums';
 
 export interface IPanelOptions {
 	/**

src/sql/base/browser/ui/panel/panel.ts

@@ -6,7 +6,7 @@
 import { IThemable } from 'vs/platform/theme/common/styler';
 import { Event, Emitter } from 'vs/base/common/event';
 import { Dimension, EventType, $, addDisposableListener } from 'vs/base/browser/dom';
-import { $ as qb } from 'vs/base/browser/builder';
+import { $ as qb } from 'sql/base/browser/builder';
 import { IAction } from 'vs/base/common/actions';
 import { IActionOptions, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';

src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts

@@ -20,7 +20,7 @@ export class HeaderFilter {
 		sortDescImage: 'sort-desc.gif'
 	};
 
-	private $menu;
+	private $menu: JQuery<HTMLElement>;
 	private options: any;
 	private okButton: Button;
 	private clearButton: Button;

src/sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin.ts

@@ -7,7 +7,7 @@
 
 import * as DOM from 'vs/base/browser/dom';
 import * as Platform from 'vs/base/common/platform';
-import { StandardMouseWheelEvent } from 'vs/base/browser/mouseEvent';
+import { StandardWheelEvent, IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { mixin } from 'vs/base/common/objects';
 
@@ -36,15 +36,15 @@ export class MouseWheelSupport implements Slick.Plugin<any> {
 	public init(grid: Slick.Grid<any>): void {
 		this.canvas = grid.getCanvasNode();
 		this.viewport = this.canvas.parentElement;
-		let onMouseWheel = (browserEvent: MouseWheelEvent) => {
-			let e = new StandardMouseWheelEvent(browserEvent);
+		let onMouseWheel = (browserEvent: IMouseWheelEvent) => {
+			let e = new StandardWheelEvent(browserEvent);
 			this._onMouseWheel(e);
 		};
 		this._disposables.push(DOM.addDisposableListener(this.viewport, 'mousewheel', onMouseWheel));
 		this._disposables.push(DOM.addDisposableListener(this.viewport, 'DOMMouseScroll', onMouseWheel));
 	}
 
-	private _onMouseWheel(e: StandardMouseWheelEvent) {
+	private _onMouseWheel(e: StandardWheelEvent) {
 		if (e.deltaY || e.deltaX) {
 			let deltaY = e.deltaY * this.options.scrollSpeed;
 			let deltaX = e.deltaX * this.options.scrollSpeed;

src/sql/base/browser/ui/table/table.ts

@@ -6,6 +6,7 @@
 import 'vs/css!./media/table';
 import { TableDataView } from './tableDataView';
 import { IDisposableDataProvider, ITableSorter, ITableMouseEvent, ITableConfiguration, ITableStyles } from 'sql/base/browser/ui/table/interfaces';
+import { $ } from 'sql/base/browser/builder';
 
 import { IThemable } from 'vs/platform/theme/common/styler';
 import * as DOM from 'vs/base/browser/dom';
@@ -16,7 +17,6 @@ import { Widget } from 'vs/base/browser/ui/widget';
 import { isArray, isBoolean } from 'vs/base/common/types';
 import { Event, Emitter } from 'vs/base/common/event';
 import { range } from 'vs/base/common/arrays';
-import { $ } from 'vs/base/browser/builder';
 
 function getDefaultOptions<T>(): Slick.GridOptions<T> {
 	return <Slick.GridOptions<T>>{
@@ -38,7 +38,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 	private _container: HTMLElement;
 	private _tableContainer: HTMLElement;
 
-	private _classChangeTimeout: number;
+	private _classChangeTimeout: NodeJS.Timer;
 
 	private _onContextMenu = new Emitter<ITableMouseEvent>();
 	public readonly onContextMenu: Event<ITableMouseEvent> = this._onContextMenu.event;

src/sql/base/browser/ui/taskbar/actionbar.ts

@@ -8,7 +8,7 @@
 import 'vs/css!vs/base/browser/ui/actionbar/actionbar';
 
 import { Promise } from 'vs/base/common/winjs.base';
-import { Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'sql/base/browser/builder';
 import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions';
 import { EventEmitter } from 'sql/base/common/eventEmitter';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -41,7 +41,6 @@ export class ActionBar extends ActionRunner implements IActionRunner {
 	private _items: IActionItem[];
 	private _focusedItem: number;
 	private _focusTracker: DOM.IFocusTracker;
-	private _toDispose: lifecycle.IDisposable[];
 
 	// Elements
 	private _domNode: HTMLElement;
@@ -352,7 +351,7 @@ export class ActionBar extends ActionRunner implements IActionRunner {
 		let actionItem = this._items[this._focusedItem];
 		if (actionItem instanceof BaseActionItem) {
 			const context = (actionItem._context === null || actionItem._context === undefined) ? event : actionItem._context;
-			this.run(actionItem._action, context).done();
+			this.run(actionItem._action, context);
 		}
 	}
 

src/sql/base/browser/ui/taskbar/taskbar.ts

@@ -11,7 +11,7 @@ import 'vs/css!sql/media/icons/common-icons';
 
 import { ActionBar } from './actionbar';
 
-import { Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $ } from 'sql/base/browser/builder';
 import { Action, IActionRunner, IAction } from 'vs/base/common/actions';
 import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IContextMenuProvider } from 'vs/base/browser/ui/dropdown/dropdown';