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

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/parts/taskHistory/common/taskService.ts
View File

@@ -8,12 +8,12 @@ import * as sqlops from 'sqlops';
import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/common/taskNode';
import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
import { localize } from 'vs/nls';
import Severity from 'vs/base/common/severity';
import { TPromise } from 'vs/base/common/winjs.base';
import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
export const SERVICE_ID = 'taskHistoryService';
export const ITaskService = createDecorator<ITaskService>(SERVICE_ID);
@@ -51,7 +51,7 @@ export class TaskService implements ITaskService {
constructor(
@ILifecycleService lifecycleService: ILifecycleService,
@IChoiceService private choiceService: IChoiceService,
@IDialogService private dialogService: IDialogService,
@IQueryEditorService private queryEditorService: IQueryEditorService
) {
this._taskQueue = new TaskNode('Root', undefined, undefined);
@@ -134,7 +134,7 @@ export class TaskService implements ITaskService {
return new TPromise<boolean>((resolve, reject) => {
let numOfInprogressTasks = this.getNumberOfInProgressTasks();
if (numOfInprogressTasks > 0) {
this.choiceService.choose(Severity.Warning, message, options, 0, false).done(choice => {
this.dialogService.show(Severity.Warning, message, options).done(choice => {
switch (choice) {
case 0:
let timeoutId: number;

2
src/sql/parts/taskHistory/viewlet/taskHistoryController.ts
View File

@@ -73,7 +73,7 @@ export class TaskHistoryController extends treedefaults.DefaultController {
getKeyBinding: (action) => this.keybindingService.lookupKeybinding(action.id),
onHide: (wasCancelled?: boolean) => {
if (wasCancelled) {
tree.DOMFocus();
tree.domFocus();
}
},
getActionsContext: () => (element)

2
src/sql/parts/taskHistory/viewlet/taskHistoryView.ts
View File

@@ -107,7 +107,7 @@ export class TaskHistoryView {
let targetsToExpand: any[];
// Focus
this._tree.DOMFocus();
this._tree.domFocus();
if (this._tree) {
let selection = this._tree.getSelection();

9
src/sql/parts/taskHistory/viewlet/taskHistoryViewlet.ts
View File

@@ -7,10 +7,9 @@
import 'vs/css!sql/media/icons/common-icons';
import 'vs/css!./media/taskHistoryViewlet';
import { TPromise } from 'vs/base/common/winjs.base';
import { Builder, Dimension } from 'vs/base/browser/builder';
import { Viewlet } from 'vs/workbench/browser/viewlet';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { toggleClass } from 'vs/base/browser/dom';
import { toggleClass, Dimension } from 'vs/base/browser/dom';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -52,11 +51,11 @@ export class TaskHistoryViewlet extends Viewlet {
});
}
public create(parent: Builder): TPromise<void> {
public create(parent: HTMLElement): TPromise<void> {
super.create(parent);
this._root = parent.getHTMLElement();
this._root = parent;
this._taskHistoryView = this._instantiationService.createInstance(TaskHistoryView);
this._taskHistoryView.renderBody(parent.getHTMLElement());
this._taskHistoryView.renderBody(parent);
return TPromise.as(null);
}