ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-23 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/base/browser/ui/taskbar/actionbar.ts
View File

@@ -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);
}
}

2
src/sql/base/browser/ui/taskbar/taskbar.ts
View File

@@ -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';