Skip to content

Commit 6e5a331

Browse files
alexdimaalexdima
committed
Organize imports
1 parent eac7644 commit 6e5a331

30 files changed

Lines changed: 392 additions & 401 deletions

‎src/vs/base/browser/dom.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import {IMouseEvent, StandardMouseEvent} from 'vs/base/browser/mouseEvent';
8-
import {IKeyboardEvent, StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent';
9-
import {isChrome, isWebKit} from 'vs/base/browser/browser';
10-
import types = require('vs/base/common/types');
7+
import {TimeoutTimer} from 'vs/base/common/async';
8+
import {onUnexpectedError} from 'vs/base/common/errors';
119
import {EventEmitter} from 'vs/base/common/eventEmitter';
1210
import {Disposable, IDisposable} from 'vs/base/common/lifecycle';
13-
import {onUnexpectedError} from 'vs/base/common/errors';
14-
import browserService = require('vs/base/browser/browserService');
15-
import {TimeoutTimer} from 'vs/base/common/async';
11+
import {isObject} from 'vs/base/common/types';
12+
import {isChrome, isWebKit} from 'vs/base/browser/browser';
13+
import {getService} from 'vs/base/browser/browserService';
14+
import {IKeyboardEvent, StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent';
15+
import {IMouseEvent, StandardMouseEvent} from 'vs/base/browser/mouseEvent';
1616

1717
export function clearNode(node: HTMLElement) {
1818
while (node.firstChild) {
@@ -34,7 +34,7 @@ export function safeStringifyDOMAware(obj: any): string {
3434
return '[Element]';
3535
}
3636

37-
if (types.isObject(value) || Array.isArray(value)) {
37+
if (isObject(value) || Array.isArray(value)) {
3838
if (seen.indexOf(value) !== -1) {
3939
return '[Circular]';
4040
} else {
@@ -776,7 +776,7 @@ export function removeCSSRulesWithPrefix(ruleName: string, style = sharedStyle):
776776
}
777777

778778
export function isHTMLElement(o: any): o is HTMLElement {
779-
return browserService.getService().isHTMLElement(o);
779+
return getService().isHTMLElement(o);
780780
}
781781

782782
export const EventType = {

‎src/vs/base/browser/globalMouseMoveMonitor.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import * as DomUtils from 'vs/base/browser/dom';
87
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
9-
import {StandardMouseEvent} from 'vs/base/browser/mouseEvent';
8+
import * as dom from 'vs/base/browser/dom';
109
import {IframeUtils} from 'vs/base/browser/iframe';
10+
import {StandardMouseEvent} from 'vs/base/browser/mouseEvent';
1111

1212
export interface IStandardMouseMoveEventData {
1313
leftButton:boolean;
@@ -92,32 +92,32 @@ export class GlobalMouseMoveMonitor<R> implements IDisposable {
9292

9393
let windowChain = IframeUtils.getSameOriginWindowChain();
9494
for (let i = 0; i < windowChain.length; i++) {
95-
this.hooks.push(DomUtils.addDisposableThrottledListener(windowChain[i].window.document, 'mousemove',
95+
this.hooks.push(dom.addDisposableThrottledListener(windowChain[i].window.document, 'mousemove',
9696
(data:R) => this.mouseMoveCallback(data),
9797
(lastEvent:R, currentEvent:MouseEvent) => this.mouseMoveEventMerger(lastEvent, currentEvent)
9898
));
99-
this.hooks.push(DomUtils.addDisposableListener(windowChain[i].window.document, 'mouseup', (e:MouseEvent) => this.stopMonitoring(true)));
99+
this.hooks.push(dom.addDisposableListener(windowChain[i].window.document, 'mouseup', (e:MouseEvent) => this.stopMonitoring(true)));
100100
}
101101

102102
if (IframeUtils.hasDifferentOriginAncestor()) {
103103
let lastSameOriginAncestor = windowChain[windowChain.length - 1];
104104
// We might miss a mouse up if it happens outside the iframe
105105
// This one is for Chrome
106-
this.hooks.push(DomUtils.addDisposableListener(lastSameOriginAncestor.window.document, 'mouseout', (browserEvent:MouseEvent) => {
106+
this.hooks.push(dom.addDisposableListener(lastSameOriginAncestor.window.document, 'mouseout', (browserEvent:MouseEvent) => {
107107
let e = new StandardMouseEvent(browserEvent);
108108
if (e.target.tagName.toLowerCase() === 'html') {
109109
this.stopMonitoring(true);
110110
}
111111
}));
112112
// This one is for FF
113-
this.hooks.push(DomUtils.addDisposableListener(lastSameOriginAncestor.window.document, 'mouseover', (browserEvent:MouseEvent) => {
113+
this.hooks.push(dom.addDisposableListener(lastSameOriginAncestor.window.document, 'mouseover', (browserEvent:MouseEvent) => {
114114
let e = new StandardMouseEvent(browserEvent);
115115
if (e.target.tagName.toLowerCase() === 'html') {
116116
this.stopMonitoring(true);
117117
}
118118
}));
119119
// This one is for IE
120-
this.hooks.push(DomUtils.addDisposableListener(lastSameOriginAncestor.window.document.body, 'mouseleave', (browserEvent:MouseEvent) => {
120+
this.hooks.push(dom.addDisposableListener(lastSameOriginAncestor.window.document.body, 'mouseleave', (browserEvent:MouseEvent) => {
121121
this.stopMonitoring(true);
122122
}));
123123
}

‎src/vs/base/browser/idleMonitor.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import * as DomUtils from 'vs/base/browser/dom';
8-
import {Disposable, IDisposable} from 'vs/base/common/lifecycle';
7+
import {TimeoutTimer} from 'vs/base/common/async';
98
import {EventEmitter} from 'vs/base/common/eventEmitter';
9+
import {Disposable, IDisposable} from 'vs/base/common/lifecycle';
1010
import {getService} from 'vs/base/browser/browserService';
11-
import {TimeoutTimer} from 'vs/base/common/async';
11+
import * as dom from 'vs/base/browser/dom';
1212

1313
export enum UserStatus {
1414
Idle,
@@ -34,8 +34,8 @@ export class IdleMonitor extends Disposable {
3434
this._idleTime = idleTime;
3535

3636
this._eventEmitter = this._register(new EventEmitter());
37-
this._register(DomUtils.addDisposableListener(getService().document, 'mousemove', () => this._onUserActive()));
38-
this._register(DomUtils.addDisposableListener(getService().document, 'keydown', () => this._onUserActive()));
37+
this._register(dom.addDisposableListener(getService().document, 'mousemove', () => this._onUserActive()));
38+
this._register(dom.addDisposableListener(getService().document, 'keydown', () => this._onUserActive()));
3939
this._onUserActive();
4040
}
4141

‎src/vs/base/browser/keyboardEvent.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
'use strict';
77

8-
import * as Platform from 'vs/base/common/platform';
9-
import * as Browser from 'vs/base/browser/browser';
10-
import {KeyMod, KeyCode} from 'vs/base/common/keyCodes';
8+
import {KeyCode, KeyMod} from 'vs/base/common/keyCodes';
9+
import * as platform from 'vs/base/common/platform';
10+
import * as browser from 'vs/base/browser/browser';
1111

1212
let KEY_CODE_MAP: {[keyCode:number]:KeyCode} = {};
1313
(function() {
@@ -127,18 +127,18 @@ let KEY_CODE_MAP: {[keyCode:number]:KeyCode} = {};
127127

128128
KEY_CODE_MAP[226] = KeyCode.OEM_102;
129129

130-
if (Browser.isIE11orEarlier) {
130+
if (browser.isIE11orEarlier) {
131131
KEY_CODE_MAP[91] = KeyCode.Meta;
132-
} else if (Browser.isFirefox) {
132+
} else if (browser.isFirefox) {
133133
KEY_CODE_MAP[59] = KeyCode.US_SEMICOLON;
134134
KEY_CODE_MAP[107] = KeyCode.US_EQUAL;
135135
KEY_CODE_MAP[109] = KeyCode.US_MINUS;
136-
if (Platform.isMacintosh) {
136+
if (platform.isMacintosh) {
137137
KEY_CODE_MAP[224] = KeyCode.Meta;
138138
}
139-
} else if (Browser.isWebKit) {
139+
} else if (browser.isWebKit) {
140140
KEY_CODE_MAP[91] = KeyCode.Meta;
141-
if (Platform.isMacintosh) {
141+
if (platform.isMacintosh) {
142142
// the two meta keys in the Mac have different key codes (91 and 93)
143143
KEY_CODE_MAP[93] = KeyCode.Meta;
144144
} else {
@@ -187,10 +187,10 @@ export interface IKeyboardEvent {
187187
stopPropagation(): void;
188188
}
189189

190-
const ctrlKeyMod = (Platform.isMacintosh ? KeyMod.WinCtrl : KeyMod.CtrlCmd);
190+
const ctrlKeyMod = (platform.isMacintosh ? KeyMod.WinCtrl : KeyMod.CtrlCmd);
191191
const altKeyMod = KeyMod.Alt;
192192
const shiftKeyMod = KeyMod.Shift;
193-
const metaKeyMod = (Platform.isMacintosh ? KeyMod.CtrlCmd : KeyMod.WinCtrl);
193+
const metaKeyMod = (platform.isMacintosh ? KeyMod.CtrlCmd : KeyMod.WinCtrl);
194194

195195
export class StandardKeyboardEvent implements IKeyboardEvent {
196196

‎src/vs/base/browser/mouseEvent.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import * as Platform from 'vs/base/common/platform';
8-
import * as Browser from 'vs/base/browser/browser';
7+
import * as platform from 'vs/base/common/platform';
8+
import * as browser from 'vs/base/browser/browser';
99
import {IframeUtils} from 'vs/base/browser/iframe';
1010

1111
export interface IMouseEvent {
@@ -83,7 +83,7 @@ export class StandardMouseEvent implements IMouseEvent {
8383
};
8484

8585
let test1 = readPageCoords, test2 = readClientCoords;
86-
if (Browser.isIE10) {
86+
if (browser.isIE10) {
8787
// The if A elseif B logic here is inversed in IE10 due to an IE10 issue
8888
test1 = readClientCoords;
8989
test2 = readPageCoords;
@@ -184,7 +184,7 @@ export class StandardMouseWheelEvent {
184184

185185
// horizontal delta scroll
186186
if (typeof e1.wheelDeltaX !== 'undefined') {
187-
if (Browser.isSafari && Platform.isWindows) {
187+
if (browser.isSafari && platform.isWindows) {
188188
this.deltaX = - (e1.wheelDeltaX / 120);
189189
} else {
190190
this.deltaX = e1.wheelDeltaX / 120;

‎src/vs/base/common/worker/simpleWorker.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66

7-
import {IWorker, IWorkerFactory} from './workerClient';
8-
import {TPromise, ValueCallback, ErrorCallback} from 'vs/base/common/winjs.base';
97
import {transformErrorForSerialization} from 'vs/base/common/errors';
108
import {Disposable} from 'vs/base/common/lifecycle';
9+
import {ErrorCallback, TPromise, ValueCallback} from 'vs/base/common/winjs.base';
10+
import {IWorker, IWorkerFactory} from './workerClient';
1111

1212
const INITIALIZE = '$initialize';
1313

0 commit comments

Comments
 (0)