ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-10 02:02:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.21 source code (#1067)

Browse Source 
* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms
This commit is contained in:
Karl Burtram
2018-04-04 15:27:51 -07:00
committed by GitHub
parent 5fba3e31b4
commit dafb780987
9412 changed files with 141255 additions and 98813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vs/platform/contextview/browser/contextMenuHandler.ts
View File

@@ -11,16 +11,16 @@ import { combinedDisposable, IDisposable } from 'vs/base/common/lifecycle';
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
import { IActionRunner, ActionRunner, IAction, IRunEvent } from 'vs/base/common/actions';
import { Menu } from 'vs/base/browser/ui/menu/menu';
import Severity from 'vs/base/common/severity';
import { IContextViewService, IContextMenuDelegate } from 'vs/platform/contextview/browser/contextView';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IMessageService } from 'vs/platform/message/common/message';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { IContextMenuDelegate } from 'vs/base/browser/contextmenu';
export class ContextMenuHandler {
private contextViewService: IContextViewService;
private messageService: IMessageService;
private notificationService: INotificationService;
private telemetryService: ITelemetryService;
private actionRunner: IActionRunner;
@@ -28,12 +28,12 @@ export class ContextMenuHandler {
private menuContainerElement: HTMLElement;
private toDispose: IDisposable[];
constructor(element: HTMLElement, contextViewService: IContextViewService, telemetryService: ITelemetryService, messageService: IMessageService) {
constructor(element: HTMLElement, contextViewService: IContextViewService, telemetryService: ITelemetryService, notificationService: INotificationService) {
this.setContainer(element);
this.contextViewService = contextViewService;
this.telemetryService = telemetryService;
this.messageService = messageService;
this.notificationService = notificationService;
this.actionRunner = new ActionRunner();
this.menuContainerElement = null;
@@ -66,8 +66,8 @@ export class ContextMenuHandler {
hideViewOnRun = false;
if (e.error && this.messageService) {
this.messageService.show(Severity.Error, e.error);
if (e.error && this.notificationService) {
this.notificationService.error(e.error);
}
}));
}