From a38db8e0a5ca9b651fd0484faefb17d706400cac Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 23 Oct 2017 16:27:44 +0200 Subject: [PATCH] fix function scope --- .../browser/parts/activitybar/activitybarActions.ts | 2 +- .../workbench/browser/parts/editor/tabsTitleControl.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts index 851a4865613..dcb5207ab72 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts @@ -7,7 +7,7 @@ import 'vs/css!./media/activityaction'; import DOM = require('vs/base/browser/dom'); -import { EventType as TouchEventType } from 'vs/base/browser/touch'; +import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch'; import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 2c0f4612a48..9b50b863a52 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -572,7 +572,7 @@ export class TabsTitleControl extends TitleControl { private hookTabListeners(tab: HTMLElement, index: number): IDisposable { const disposables: IDisposable[] = []; - function handleClickOrTouch(e: MouseEvent | GestureEvent): void { + const handleClickOrTouch = (e: MouseEvent | GestureEvent) => { tab.blur(); if (e instanceof MouseEvent && e.button !== 0) { @@ -583,15 +583,15 @@ export class TabsTitleControl extends TitleControl { if (!this.isTabActionBar((e.target || e.srcElement) as HTMLElement)) { setTimeout(() => this.editorService.openEditor(editor, null, position).done(null, errors.onUnexpectedError)); // timeout to keep focus in editor after mouse up } - } + }; - function showContextMenu(e: StandardKeyboardEvent | GestureEvent): void { + const showContextMenu = (e: Event) => { DOM.EventHelper.stop(e); const { group, editor } = this.toTabContext(index); this.onContextMenu({ group, editor }, e, tab); - } + }; // Open on Click disposables.push(DOM.addDisposableListener(tab, DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => handleClickOrTouch(e))); @@ -613,7 +613,7 @@ export class TabsTitleControl extends TitleControl { disposables.push(DOM.addDisposableListener(tab, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => { const event = new StandardKeyboardEvent(e); if (event.shiftKey && event.keyCode === KeyCode.F10) { - showContextMenu(event); + showContextMenu(e); } })); -- GitLab