Skip to content

Commit c8604d4

Browse files
author
Benjamin Pasero
committed
more linting in base
1 parent bc387b6 commit c8604d4

5 files changed

Lines changed: 172 additions & 180 deletions

File tree

‎src/vs/base/browser/ui/leftRightWidget/leftRightWidget.ts‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,21 @@
66
'use strict';
77

88
import 'vs/css!./leftRightWidget';
9-
import Builder = require('vs/base/browser/builder');
10-
import Lifecycle = require('vs/base/common/lifecycle');
11-
12-
var $ = Builder.$;
9+
import {Builder, $} from 'vs/base/browser/builder';
10+
import {IDisposable} from 'vs/base/common/lifecycle';
1311

1412
export interface IRenderer {
15-
(container:HTMLElement): Lifecycle.IDisposable;
13+
(container: HTMLElement): IDisposable;
1614
}
1715

1816
export class LeftRightWidget {
1917

20-
private $el: Builder.Builder;
21-
private toDispose: Lifecycle.IDisposable[];
18+
private $el: Builder;
19+
private toDispose: IDisposable[];
2220

23-
constructor (container:Builder.Builder, renderLeftFn:IRenderer, renderRightFn:IRenderer);
24-
constructor (container:HTMLElement, renderLeftFn:IRenderer, renderRightFn:IRenderer);
25-
constructor (container:any, renderLeftFn:IRenderer, renderRightFn:IRenderer) {
21+
constructor(container: Builder, renderLeftFn: IRenderer, renderRightFn: IRenderer);
22+
constructor(container: HTMLElement, renderLeftFn: IRenderer, renderRightFn: IRenderer);
23+
constructor(container: any, renderLeftFn: IRenderer, renderRightFn: IRenderer) {
2624
this.$el = $('.monaco-left-right-widget').appendTo(container);
2725

2826
this.toDispose = [

‎src/vs/base/browser/ui/progressbar/progressbar.ts‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
'use strict';
77

88
import 'vs/css!./progressbar';
9-
import WinJS = require('vs/base/common/winjs.base');
10-
import Assert = require('vs/base/common/assert');
11-
import Browser = require('vs/base/browser/browser');
12-
import Builder = require('vs/base/browser/builder');
9+
import {Promise, ValueCallback} from 'vs/base/common/winjs.base';
10+
import assert = require('vs/base/common/assert');
11+
import browser = require('vs/base/browser/browser');
12+
import {Builder, $} from 'vs/base/browser/builder';
1313
import DOM = require('vs/base/browser/dom');
14-
import Uuid = require('vs/base/common/uuid');
14+
import uuid = require('vs/base/common/uuid');
1515

1616
const css_done = 'done';
1717
const css_active = 'active';
@@ -20,30 +20,28 @@ const css_discrete = 'discrete';
2020
const css_progress_container = 'progress-container';
2121
const css_progress_bit = 'progress-bit';
2222

23-
const $ = Builder.$;
24-
2523
/**
2624
* A progress bar with support for infinite or discrete progress.
2725
*/
2826
export class ProgressBar {
2927

3028
private toUnbind: { (): void; }[];
3129
private workedVal: number;
32-
private element: Builder.Builder;
30+
private element: Builder;
3331
private animationRunning: boolean;
3432
private bit: HTMLElement;
3533
private totalWork: number;
36-
private animationStopToken: WinJS.ValueCallback;
34+
private animationStopToken: ValueCallback;
3735
private currentProgressToken: string;
3836

39-
constructor(builder: Builder.Builder) {
37+
constructor(builder: Builder) {
4038
this.toUnbind = [];
4139
this.workedVal = 0;
4240

4341
this.create(builder);
4442
}
4543

46-
private create(parent: Builder.Builder): void {
44+
private create(parent: Builder): void {
4745
parent.div({ 'class': css_progress_container }, (builder) => {
4846
this.element = builder.clone();
4947

@@ -100,7 +98,7 @@ export class ProgressBar {
10098
this.bit.style.width = 'inherit';
10199

102100
if (delayed) {
103-
WinJS.Promise.timeout(200).then(() => this.off());
101+
Promise.timeout(200).then(() => this.off());
104102
} else {
105103
this.off();
106104
}
@@ -110,7 +108,7 @@ export class ProgressBar {
110108
else {
111109
this.bit.style.opacity = '0';
112110
if (delayed) {
113-
WinJS.Promise.timeout(200).then(() => this.off());
111+
Promise.timeout(200).then(() => this.off());
114112
} else {
115113
this.off();
116114
}
@@ -131,10 +129,10 @@ export class ProgressBar {
131129
this.element.addClass(css_active);
132130
this.element.addClass(css_infinite);
133131

134-
if (!Browser.hasCSSAnimationSupport()) {
132+
if (!browser.hasCSSAnimationSupport()) {
135133

136134
// Use a generated token to avoid race conditions from reentrant calls to this function
137-
let currentProgressToken = Uuid.v4().asHex();
135+
let currentProgressToken = uuid.v4().asHex();
138136
this.currentProgressToken = currentProgressToken;
139137

140138
this.manualInfinite(currentProgressToken);
@@ -144,13 +142,12 @@ export class ProgressBar {
144142
}
145143

146144
private manualInfinite(currentProgressToken: string): void {
147-
148145
this.bit.style.width = '5%';
149146
this.bit.style.display = 'inherit';
150147

151148
let counter = 0;
152149
let animationFn: () => void = () => {
153-
WinJS.Promise.timeout(50).then(() => {
150+
Promise.timeout(50).then(() => {
154151

155152
// Return if another manualInfinite() call was made
156153
if (currentProgressToken !== this.currentProgressToken) {
@@ -203,10 +200,10 @@ export class ProgressBar {
203200
* Tells the progress bar that an amount of work has been completed.
204201
*/
205202
public worked(value: number): ProgressBar {
206-
Assert.ok(!isNaN(this.totalWork), 'Total work not set');
203+
assert.ok(!isNaN(this.totalWork), 'Total work not set');
207204

208205
value = Number(value);
209-
Assert.ok(!isNaN(value), 'Value is not a number');
206+
assert.ok(!isNaN(value), 'Value is not a number');
210207
value = Math.max(1, value);
211208

212209
this.workedVal += value;
@@ -236,7 +233,7 @@ export class ProgressBar {
236233
/**
237234
* Returns the builder this progress bar is building in.
238235
*/
239-
public getContainer(): Builder.Builder {
236+
public getContainer(): Builder {
240237
return $(this.element);
241238
}
242239

‎src/vs/base/browser/ui/sash/sash.ts‎

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
'use strict';
77

88
import 'vs/css!./sash';
9-
import Lifecycle = require('vs/base/common/lifecycle');
10-
import Builder = require('vs/base/browser/builder');
11-
import Browser = require('vs/base/browser/browser');
12-
import Types = require('vs/base/common/types');
9+
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
10+
import {Builder, $} from 'vs/base/browser/builder';
11+
import {isIPad} from 'vs/base/browser/browser';
12+
import types = require('vs/base/common/types');
1313
import DOM = require('vs/base/browser/dom');
14-
import Touch = require('vs/base/browser/touch');
15-
import Events = require('vs/base/common/eventEmitter');
16-
import Mouse = require('vs/base/browser/mouseEvent');
17-
18-
var $ = <Builder.QuickBuilder> Builder.$;
14+
import {Gesture, EventType, GestureEvent} from 'vs/base/browser/touch';
15+
import {EventEmitter} from 'vs/base/common/eventEmitter';
16+
import {StandardMouseEvent} from 'vs/base/browser/mouseEvent';
1917

2018
export interface ISashLayoutProvider { }
2119

@@ -50,10 +48,10 @@ export enum Orientation {
5048
HORIZONTAL
5149
}
5250

53-
export class Sash extends Events.EventEmitter {
51+
export class Sash extends EventEmitter {
5452

55-
private $e: Builder.Builder;
56-
private gesture: Touch.Gesture;
53+
private $e: Builder;
54+
private gesture: Gesture;
5755
private layoutProvider: ISashLayoutProvider;
5856
private isDisabled: boolean;
5957
private hidden: boolean;
@@ -65,17 +63,17 @@ export class Sash extends Events.EventEmitter {
6563

6664
this.$e = $('.monaco-sash').appendTo(container);
6765

68-
this.gesture = new Touch.Gesture(this.$e.getHTMLElement());
66+
this.gesture = new Gesture(this.$e.getHTMLElement());
6967

7068
this.$e.on('mousedown', (e: MouseEvent) => { this.onMouseDown(e); });
71-
this.$e.on(Touch.EventType.Start, (e: Touch.GestureEvent) => { this.onTouchStart(e); });
69+
this.$e.on(EventType.Start, (e: GestureEvent) => { this.onTouchStart(e); });
7270

7371
this.orientation = options.orientation || Orientation.VERTICAL;
7472
this.$e.addClass(this.orientation === Orientation.HORIZONTAL ? 'horizontal' : 'vertical');
7573

7674
this.size = options.baseSize || 5;
7775

78-
if (Browser.isIPad) {
76+
if (isIPad) {
7977
this.size *= 4; // see also http://ux.stackexchange.com/questions/39023/what-is-the-optimum-button-size-of-touch-screen-applications
8078
this.$e.addClass('touch');
8179
}
@@ -102,11 +100,11 @@ export class Sash extends Events.EventEmitter {
102100
return;
103101
}
104102

105-
var mouseDownEvent = new Mouse.StandardMouseEvent(e);
106-
var startX = mouseDownEvent.posx;
107-
var startY = mouseDownEvent.posy;
103+
let mouseDownEvent = new StandardMouseEvent(e);
104+
let startX = mouseDownEvent.posx;
105+
let startY = mouseDownEvent.posy;
108106

109-
var startEvent: ISashEvent = {
107+
let startEvent: ISashEvent = {
110108
startX: startX,
111109
currentX: startX,
112110
instantDiffX: 0,
@@ -118,7 +116,7 @@ export class Sash extends Events.EventEmitter {
118116
this.$e.addClass('active');
119117
this.emit('start', startEvent);
120118

121-
var overlayDiv = $('div').style({
119+
let overlayDiv = $('div').style({
122120
position: 'absolute',
123121
top: 0,
124122
left: 0,
@@ -128,16 +126,16 @@ export class Sash extends Events.EventEmitter {
128126
cursor: this.orientation === Orientation.VERTICAL ? 'ew-resize' : 'ns-resize'
129127
});
130128

131-
var $window = $(window);
129+
let $window = $(window);
132130

133-
var lastCurrentX = startX;
134-
var lastCurrentY = startY;
131+
let lastCurrentX = startX;
132+
let lastCurrentY = startY;
135133

136134
$window.on('mousemove', (e: MouseEvent) => {
137135
DOM.EventHelper.stop(e, false);
138-
var mouseMoveEvent = new Mouse.StandardMouseEvent(e);
136+
let mouseMoveEvent = new StandardMouseEvent(e);
139137

140-
var event: ISashEvent = {
138+
let event: ISashEvent = {
141139
startX: startX,
142140
currentX: mouseMoveEvent.posx,
143141
instantDiffX: mouseMoveEvent.posx - lastCurrentX,
@@ -162,13 +160,13 @@ export class Sash extends Events.EventEmitter {
162160
overlayDiv.appendTo(document.body);
163161
}
164162

165-
private onTouchStart(event: Touch.GestureEvent): void {
163+
private onTouchStart(event: GestureEvent): void {
166164
DOM.EventHelper.stop(event);
167165

168-
var listeners: Lifecycle.IDisposable[] = [];
166+
let listeners: IDisposable[] = [];
169167

170-
var startX = event.pageX;
171-
var startY = event.pageY;
168+
let startX = event.pageX;
169+
let startY = event.pageY;
172170

173171
this.emit('start', {
174172
startX: startX,
@@ -179,11 +177,11 @@ export class Sash extends Events.EventEmitter {
179177
instantDiffY: 0
180178
});
181179

182-
var lastCurrentX = startX;
183-
var lastCurrentY = startY;
180+
let lastCurrentX = startX;
181+
let lastCurrentY = startY;
184182

185-
listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), Touch.EventType.Change, (event: Touch.GestureEvent) => {
186-
if (Types.isNumber(event.pageX) && Types.isNumber(event.pageY)) {
183+
listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), EventType.Change, (event: GestureEvent) => {
184+
if (types.isNumber(event.pageX) && types.isNumber(event.pageY)) {
187185
this.emit('change', {
188186
startX: startX,
189187
currentX: event.pageX,
@@ -198,17 +196,17 @@ export class Sash extends Events.EventEmitter {
198196
}
199197
}));
200198

201-
listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), Touch.EventType.End, (event: Touch.GestureEvent) => {
199+
listeners.push(DOM.addDisposableListener(this.$e.getHTMLElement(), EventType.End, (event: GestureEvent) => {
202200
this.emit('end');
203-
Lifecycle.disposeAll(listeners);
201+
disposeAll(listeners);
204202
}));
205203
}
206204

207205
public layout(): void {
208-
var style: { top?: string; left?: string; height?: string; width?: string; };
206+
let style: { top?: string; left?: string; height?: string; width?: string; };
209207

210208
if (this.orientation === Orientation.VERTICAL) {
211-
var verticalProvider = (<IVerticalSashLayoutProvider>this.layoutProvider);
209+
let verticalProvider = (<IVerticalSashLayoutProvider>this.layoutProvider);
212210
style = { left: verticalProvider.getVerticalSashLeft(this) - (this.size / 2) + 'px' };
213211

214212
if (verticalProvider.getVerticalSashTop) {
@@ -219,7 +217,7 @@ export class Sash extends Events.EventEmitter {
219217
style.height = verticalProvider.getVerticalSashHeight(this) + 'px';
220218
}
221219
} else {
222-
var horizontalProvider = (<IHorizontalSashLayoutProvider>this.layoutProvider);
220+
let horizontalProvider = (<IHorizontalSashLayoutProvider>this.layoutProvider);
223221
style = { top: horizontalProvider.getHorizontalSashTop(this) - (this.size / 2) + 'px' };
224222

225223
if (horizontalProvider.getHorizontalSashLeft) {

0 commit comments

Comments
 (0)