Merge from master

src/vs/base/parts/tree/browser/tree.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as WinJS from 'vs/base/common/winjs.base';
 import * as Touch from 'vs/base/browser/touch';
@@ -364,6 +363,10 @@ export interface IDataSource {
 	/**
 	 * Returns the unique identifier of the given element.
 	 * No more than one element may use a given identifier.
+	 *
+	 * You should not attempt to "move" an element to a different
+	 * parent by keeping its ID. The idea here is to have tree location
+	 * related IDs (eg. full file path, in the Explorer example).
 	 */
 	getId(tree: ITree, element: any): string;
 
@@ -551,6 +554,11 @@ export interface IController {
 	 */
 	onKeyUp(tree: ITree, event: Keyboard.IKeyboardEvent): boolean;
 
+	/**
+	 * Called when a mouse middle button is pressed down on an element.
+	 */
+	onMouseMiddleClick?(tree: ITree, element: any, event: Mouse.IMouseEvent): boolean;
+
 	/**
 	 * Called when a mouse button is pressed down on an element.
 	 */
@@ -562,12 +570,12 @@ export interface IController {
 	onMouseUp?(tree: ITree, element: any, event: Mouse.IMouseEvent): boolean;
 }
 
-export enum DragOverEffect {
+export const enum DragOverEffect {
 	COPY,
 	MOVE
 }
 
-export enum DragOverBubble {
+export const enum DragOverBubble {
 	BUBBLE_DOWN,
 	BUBBLE_UP
 }
@@ -731,7 +739,7 @@ export interface IActionProvider {
 	/**
 	 * Returns a promise of an array with the actions of the element that should show up in place right to the element in the tree.
 	 */
-	getActions(tree: ITree, element: any): WinJS.TPromise<IAction[]>;
+	getActions(tree: ITree, element: any): IAction[];
 
 	/**
 	 * Returns whether or not the element has secondary actions. These show up once the user has expanded the element's action bar.
@@ -741,10 +749,10 @@ export interface IActionProvider {
 	/**
 	 * Returns a promise of an array with the secondary actions of the element that should show up once the user has expanded the element's action bar.
 	 */
-	getSecondaryActions(tree: ITree, element: any): WinJS.TPromise<IAction[]>;
+	getSecondaryActions(tree: ITree, element: any): IAction[];
 
 	/**
 	 * Returns an action item to render an action.
 	 */
 	getActionItem(tree: ITree, element: any, action: IAction): IActionItem;
-}
+}