From cc41fefe3164ffa77a50f5fea1b3468bdc01bb6f Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sat, 23 Jun 2018 17:25:07 +1000 Subject: [PATCH] Move MouseZoneManager into ui/ --- src/Linkifier.test.ts | 2 +- src/Linkifier.ts | 4 ++-- src/Terminal.ts | 4 ++-- src/Types.ts | 2 +- src/{input => ui}/MouseZoneManager.ts | 2 +- src/{input => ui}/Types.ts | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename src/{input => ui}/MouseZoneManager.ts (99%) rename src/{input => ui}/Types.ts (100%) diff --git a/src/Linkifier.test.ts b/src/Linkifier.test.ts index c09f2ef9..54e7e88d 100644 --- a/src/Linkifier.test.ts +++ b/src/Linkifier.test.ts @@ -4,7 +4,7 @@ */ import { assert } from 'chai'; -import { IMouseZoneManager, IMouseZone } from './input/Types'; +import { IMouseZoneManager, IMouseZone } from './ui/Types'; import { ILinkMatcher, LineData, ITerminal } from './Types'; import { Linkifier } from './Linkifier'; import { MockBuffer, MockTerminal } from './utils/TestUtils.test'; diff --git a/src/Linkifier.ts b/src/Linkifier.ts index e548551a..88ff1b78 100644 --- a/src/Linkifier.ts +++ b/src/Linkifier.ts @@ -3,9 +3,9 @@ * @license MIT */ -import { IMouseZoneManager } from './input/Types'; +import { IMouseZoneManager } from './ui/Types'; import { ILinkHoverEvent, ILinkMatcher, LinkMatcherHandler, LinkHoverEventTypes, ILinkMatcherOptions, ILinkifier, ITerminal } from './Types'; -import { MouseZone } from './input/MouseZoneManager'; +import { MouseZone } from './ui/MouseZoneManager'; import { EventEmitter } from './EventEmitter'; /** diff --git a/src/Terminal.ts b/src/Terminal.ts index a9a309c5..fb175ad0 100644 --- a/src/Terminal.ts +++ b/src/Terminal.ts @@ -22,7 +22,7 @@ */ import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminalOptions, ITerminal, IBrowser, ILinkifier, ILinkMatcherOptions, CustomKeyEventHandler, LinkMatcherHandler, CharData, LineData } from './Types'; -import { IMouseZoneManager } from './input/Types'; +import { IMouseZoneManager } from './ui/Types'; import { IRenderer } from './renderer/Types'; import { BufferSet } from './BufferSet'; import { Buffer, MAX_BUFFER_SIZE, DEFAULT_ATTR } from './Buffer'; @@ -44,7 +44,7 @@ import { MouseHelper } from './utils/MouseHelper'; import { clone } from './utils/Clone'; import { DEFAULT_BELL_SOUND, SoundManager } from './SoundManager'; import { DEFAULT_ANSI_COLORS } from './renderer/ColorManager'; -import { MouseZoneManager } from './input/MouseZoneManager'; +import { MouseZoneManager } from './ui/MouseZoneManager'; import { AccessibilityManager } from './AccessibilityManager'; import { ScreenDprMonitor } from './utils/ScreenDprMonitor'; import { ITheme, IMarker, IDisposable } from 'xterm'; diff --git a/src/Types.ts b/src/Types.ts index f7273eb6..f3a84550 100644 --- a/src/Types.ts +++ b/src/Types.ts @@ -5,7 +5,7 @@ import { Terminal as PublicTerminal, ITerminalOptions as IPublicTerminalOptions, IEventEmitter, IDisposable } from 'xterm'; import { IColorSet, IRenderer } from './renderer/Types'; -import { IMouseZoneManager } from './input/Types'; +import { IMouseZoneManager } from './ui/Types'; import { ICharset } from './core/Types'; export type CustomKeyEventHandler = (event: KeyboardEvent) => boolean; diff --git a/src/input/MouseZoneManager.ts b/src/ui/MouseZoneManager.ts similarity index 99% rename from src/input/MouseZoneManager.ts rename to src/ui/MouseZoneManager.ts index e791a982..491e2a05 100644 --- a/src/input/MouseZoneManager.ts +++ b/src/ui/MouseZoneManager.ts @@ -6,7 +6,7 @@ import { ITerminal } from '../Types'; import { IMouseZoneManager, IMouseZone } from './Types'; import { Disposable } from '../common/Lifecycle'; -import { addDisposableDomListener } from '../ui/Lifecycle'; +import { addDisposableDomListener } from './Lifecycle'; const HOVER_DURATION = 500; diff --git a/src/input/Types.ts b/src/ui/Types.ts similarity index 100% rename from src/input/Types.ts rename to src/ui/Types.ts