cargdev/angular
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(): use const and let instead of var

Browse Source
This commit is contained in:
Joao Dias
2016-11-12 14:08:58 +01:00
committed by Victor Berchet
parent 73593d4bf3
commit 77ee27c59e
435 changed files with 4637 additions and 4663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modules/@angular/platform-webworker/test/web_workers/shared/message_bus_spec.ts
View File

@ -18,7 +18,7 @@ export function main() {
* Tests the PostMessageBus
*/
describe('MessageBus', () => {
var bus: MessageBus;
let bus: MessageBus;
beforeEach(() => { bus = createConnectedMessageBus(); });
@ -28,14 +28,14 @@ export function main() {
const MESSAGE = 'Test message';
bus.initChannel(CHANNEL, false);
var fromEmitter = bus.from(CHANNEL);
const fromEmitter = bus.from(CHANNEL);
fromEmitter.subscribe({
next: (message: any) => {
expect(message).toEqual(MESSAGE);
async.done();
}
});
var toEmitter = bus.to(CHANNEL);
const toEmitter = bus.to(CHANNEL);
toEmitter.emit(MESSAGE);
}));
@ -45,8 +45,8 @@ export function main() {
const NUM_LISTENERS = 2;
bus.initChannel(CHANNEL, false);
var callCount = 0;
var emitHandler = (message: any) => {
let callCount = 0;
const emitHandler = (message: any) => {
expect(message).toEqual(MESSAGE);
callCount++;
if (callCount == NUM_LISTENERS) {
@ -54,12 +54,12 @@ export function main() {
}
};
for (var i = 0; i < NUM_LISTENERS; i++) {
var emitter = bus.from(CHANNEL);
for (let i = 0; i < NUM_LISTENERS; i++) {
const emitter = bus.from(CHANNEL);
emitter.subscribe({next: emitHandler});
}
var toEmitter = bus.to(CHANNEL);
const toEmitter = bus.to(CHANNEL);
toEmitter.emit(MESSAGE);
}));
@ -69,11 +69,11 @@ export function main() {
const CHANNEL_TWO = 'CHANNEL 2';
const MESSAGE_ONE = 'This is a message on CHANNEL 1';
const MESSAGE_TWO = 'This is a message on CHANNEL 2';
var callCount = 0;
let callCount = 0;
bus.initChannel(CHANNEL_ONE, false);
bus.initChannel(CHANNEL_TWO, false);
var firstFromEmitter = bus.from(CHANNEL_ONE);
const firstFromEmitter = bus.from(CHANNEL_ONE);
firstFromEmitter.subscribe({
next: (message: any) => {
expect(message).toEqual(MESSAGE_ONE);
@ -83,7 +83,7 @@ export function main() {
}
}
});
var secondFromEmitter = bus.from(CHANNEL_TWO);
const secondFromEmitter = bus.from(CHANNEL_TWO);
secondFromEmitter.subscribe({
next: (message: any) => {
expect(message).toEqual(MESSAGE_TWO);
@ -94,16 +94,16 @@ export function main() {
}
});
var firstToEmitter = bus.to(CHANNEL_ONE);
const firstToEmitter = bus.to(CHANNEL_ONE);
firstToEmitter.emit(MESSAGE_ONE);
var secondToEmitter = bus.to(CHANNEL_TWO);
const secondToEmitter = bus.to(CHANNEL_TWO);
secondToEmitter.emit(MESSAGE_TWO);
}));
});
describe('PostMessageBusSink', () => {
var bus: MessageBus;
let bus: MessageBus;
const CHANNEL = 'Test Channel';
function setup(runInZone: boolean, zone: NgZone) {
@ -125,7 +125,7 @@ export function main() {
bus = createConnectedMessageBus();
setup(true, zone);
var wasCalled = false;
let wasCalled = false;
bus.from(CHANNEL).subscribe({next: (message: any) => { wasCalled = true; }});
bus.to(CHANNEL).emit('hi');
@ -147,7 +147,7 @@ export function main() {
bus = createConnectedMessageBus();
setup(false, zone);
var wasCalled = false;
let wasCalled = false;
bus.from(CHANNEL).subscribe({next: (message: any) => { wasCalled = true; }});
bus.to(CHANNEL).emit('hi');

6
modules/@angular/platform-webworker/test/web_workers/shared/message_bus_util.ts
View File

@ -15,9 +15,9 @@ import {PostMessageBus, PostMessageBusSink, PostMessageBusSource} from '@angular
* Useful for testing the sink and source.
*/
export function createConnectedMessageBus(): MessageBus {
var mockPostMessage = new MockPostMessage();
var source = new PostMessageBusSource(<any>mockPostMessage);
var sink = new PostMessageBusSink(mockPostMessage);
const mockPostMessage = new MockPostMessage();
const source = new PostMessageBusSource(<any>mockPostMessage);
const sink = new PostMessageBusSink(mockPostMessage);
return new PostMessageBus(sink, source);
}

10
modules/@angular/platform-webworker/test/web_workers/shared/render_store_spec.ts
View File

@ -10,7 +10,7 @@ import {RenderStore} from '@angular/platform-webworker/src/web_workers/shared/re
export function main() {
describe('RenderStoreSpec', () => {
var store: RenderStore;
let store: RenderStore;
beforeEach(() => { store = new RenderStore(); });
it('should allocate ids', () => {
@ -19,15 +19,15 @@ export function main() {
});
it('should serialize objects', () => {
var id = store.allocateId();
var obj = 'testObject';
const id = store.allocateId();
const obj = 'testObject';
store.store(obj, id);
expect(store.serialize(obj)).toBe(id);
});
it('should deserialize objects', () => {
var id = store.allocateId();
var obj = 'testObject';
const id = store.allocateId();
const obj = 'testObject';
store.store(obj, id);
expect(store.deserialize(id)).toBe(obj);
});

6
modules/@angular/platform-webworker/test/web_workers/shared/service_message_broker_spec.ts
View File

@ -26,7 +26,7 @@ export function main() {
beforeEachProviders(() => [Serializer, {provide: ON_WEB_WORKER, useValue: true}, RenderStore]);
describe('UIMessageBroker', () => {
var messageBuses: any /** TODO #9100 */;
let messageBuses: any /** TODO #9100 */;
beforeEach(() => {
messageBuses = createPairedMessageBuses();
@ -35,7 +35,7 @@ export function main() {
});
it('should call registered method with correct arguments',
inject([Serializer], (serializer: Serializer) => {
var broker = new ServiceMessageBroker_(messageBuses.ui, serializer, CHANNEL);
const broker = new ServiceMessageBroker_(messageBuses.ui, serializer, CHANNEL);
broker.registerMethod(TEST_METHOD, [PRIMITIVE, PRIMITIVE], (arg1, arg2) => {
expect(arg1).toEqual(PASSED_ARG_1);
expect(arg2).toEqual(PASSED_ARG_2);
@ -45,7 +45,7 @@ export function main() {
}));
it('should return promises to the worker', inject([Serializer], (serializer: Serializer) => {
var broker = new ServiceMessageBroker_(messageBuses.ui, serializer, CHANNEL);
const broker = new ServiceMessageBroker_(messageBuses.ui, serializer, CHANNEL);
broker.registerMethod(TEST_METHOD, [PRIMITIVE], (arg1) => {
expect(arg1).toEqual(PASSED_ARG_1);
return new Promise((res, rej) => {

16
modules/@angular/platform-webworker/test/web_workers/shared/web_worker_test_util.ts
View File

@ -20,13 +20,13 @@ import {MockEventEmitter} from './mock_event_emitter';
* Such that whatever goes into one's sink comes out the others source.
*/
export function createPairedMessageBuses(): PairedMessageBuses {
var firstChannels: {[key: string]: MockEventEmitter<any>} = {};
var workerMessageBusSink = new MockMessageBusSink(firstChannels);
var uiMessageBusSource = new MockMessageBusSource(firstChannels);
const firstChannels: {[key: string]: MockEventEmitter<any>} = {};
const workerMessageBusSink = new MockMessageBusSink(firstChannels);
const uiMessageBusSource = new MockMessageBusSource(firstChannels);
var secondChannels: {[key: string]: MockEventEmitter<any>} = {};
var uiMessageBusSink = new MockMessageBusSink(secondChannels);
var workerMessageBusSource = new MockMessageBusSource(secondChannels);
const secondChannels: {[key: string]: MockEventEmitter<any>} = {};
const uiMessageBusSink = new MockMessageBusSink(secondChannels);
const workerMessageBusSource = new MockMessageBusSource(secondChannels);
return new PairedMessageBuses(
new MockMessageBus(uiMessageBusSink, uiMessageBusSource),
@ -48,9 +48,9 @@ export function expectBrokerCall(
expect(args.args.length).toEqual(vals.length);
vals.forEach((v, i) => { expect(v).toEqual(args.args[i].value); });
}
var promise: Promise<any>|void = null;
let promise: Promise<any>|void = null;
if (isPresent(handler)) {
let givenValues = args.args.map((arg) => arg.value);
const givenValues = args.args.map((arg) => arg.value);
if (givenValues.length > 0) {
promise = handler(givenValues);
} else {

24
modules/@angular/platform-webworker/test/web_workers/worker/platform_location_spec.ts
View File

@ -19,10 +19,10 @@ import {SpyMessageBroker} from './spies';
export function main() {
describe('WebWorkerPlatformLocation', () => {
var uiBus: MessageBus = null;
var workerBus: MessageBus = null;
var broker: any = null;
var TEST_LOCATION = new LocationType(
let uiBus: MessageBus = null;
let workerBus: MessageBus = null;
let broker: any = null;
const TEST_LOCATION = new LocationType(
'http://www.example.com', 'http', 'example.com', 'example.com', '80', '/', '', '',
'http://www.example.com');
@ -33,12 +33,12 @@ export function main() {
return Promise.resolve(loc);
}
});
var factory = new MockMessageBrokerFactory(broker);
const factory = new MockMessageBrokerFactory(broker);
return new WebWorkerPlatformLocation(factory, workerBus, null);
}
function testPushOrReplaceState(pushState: boolean) {
let platformLocation = createWebWorkerPlatformLocation(null);
const platformLocation = createWebWorkerPlatformLocation(null);
const TITLE = 'foo';
const URL = 'http://www.example.com/foo';
expectBrokerCall(broker, pushState ? 'pushState' : 'replaceState', [null, TITLE, URL]);
@ -50,7 +50,7 @@ export function main() {
}
beforeEach(() => {
var buses = createPairedMessageBuses();
const buses = createPairedMessageBuses();
uiBus = buses.ui;
workerBus = buses.worker;
workerBus.initChannel('ng-Router');
@ -59,27 +59,27 @@ export function main() {
});
it('should throw if getBaseHrefFromDOM is called', () => {
let platformLocation = createWebWorkerPlatformLocation(null);
const platformLocation = createWebWorkerPlatformLocation(null);
expect(() => platformLocation.getBaseHrefFromDOM()).toThrowError();
});
it('should get location on init', () => {
let platformLocation = createWebWorkerPlatformLocation(null);
const platformLocation = createWebWorkerPlatformLocation(null);
expectBrokerCall(broker, 'getLocation');
platformLocation.init();
});
it('should throw if set pathname is called before init finishes', () => {
let platformLocation = createWebWorkerPlatformLocation(null);
const platformLocation = createWebWorkerPlatformLocation(null);
platformLocation.init();
expect(() => platformLocation.pathname = 'TEST').toThrowError();
});
it('should send pathname to render thread',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
let platformLocation = createWebWorkerPlatformLocation(TEST_LOCATION);
const platformLocation = createWebWorkerPlatformLocation(TEST_LOCATION);
platformLocation.init().then((_) => {
let PATHNAME = '/test';
const PATHNAME = '/test';
expectBrokerCall(broker, 'setPathname', [PATHNAME]);
platformLocation.pathname = PATHNAME;
async.done();

50
modules/@angular/platform-webworker/test/web_workers/worker/renderer_animation_integration_spec.ts
View File

@ -31,16 +31,16 @@ export function main() {
function createWebWorkerBrokerFactory(
messageBuses: PairedMessageBuses, workerSerializer: Serializer, uiSerializer: Serializer,
domRootRenderer: DomRootRenderer, uiRenderStore: RenderStore): ClientMessageBrokerFactory {
var uiMessageBus = messageBuses.ui;
var workerMessageBus = messageBuses.worker;
const uiMessageBus = messageBuses.ui;
const workerMessageBus = messageBuses.worker;
// set up the worker side
var webWorkerBrokerFactory =
const webWorkerBrokerFactory =
new ClientMessageBrokerFactory_(workerMessageBus, workerSerializer);
// set up the ui side
var uiMessageBrokerFactory = new ServiceMessageBrokerFactory_(uiMessageBus, uiSerializer);
var renderer = new MessageBasedRenderer(
const uiMessageBrokerFactory = new ServiceMessageBrokerFactory_(uiMessageBus, uiSerializer);
const renderer = new MessageBasedRenderer(
uiMessageBrokerFactory, uiMessageBus, uiSerializer, uiRenderStore, domRootRenderer);
renderer.start();
@ -50,10 +50,10 @@ export function main() {
function createWorkerRenderer(
workerSerializer: Serializer, uiSerializer: Serializer, domRootRenderer: DomRootRenderer,
uiRenderStore: RenderStore, workerRenderStore: RenderStore): RootRenderer {
var messageBuses = createPairedMessageBuses();
var brokerFactory = createWebWorkerBrokerFactory(
const messageBuses = createPairedMessageBuses();
const brokerFactory = createWebWorkerBrokerFactory(
messageBuses, workerSerializer, uiSerializer, domRootRenderer, uiRenderStore);
var workerRootRenderer = new WebWorkerRootRenderer(
const workerRootRenderer = new WebWorkerRootRenderer(
brokerFactory, messageBuses.worker, workerSerializer, workerRenderStore);
return new DebugDomRootRenderer(workerRootRenderer);
}
@ -62,9 +62,9 @@ export function main() {
// Don't run on server...
if (!getDOM().supportsDOMEvents()) return;
var uiTestBed: TestBed;
var uiRenderStore: RenderStore;
var workerRenderStore: RenderStore;
let uiTestBed: TestBed;
let uiRenderStore: RenderStore;
let workerRenderStore: RenderStore;
beforeEach(() => {
uiRenderStore = new RenderStore();
@ -79,8 +79,8 @@ export function main() {
{provide: RootRenderer, useExisting: DomRootRenderer}
]
});
var uiSerializer = uiTestBed.get(Serializer);
var domRootRenderer = uiTestBed.get(DomRootRenderer);
const uiSerializer = uiTestBed.get(Serializer);
const domRootRenderer = uiTestBed.get(DomRootRenderer);
workerRenderStore = new RenderStore();
TestBed.configureTestingModule({
@ -99,7 +99,7 @@ export function main() {
});
});
var uiDriver: MockAnimationDriver;
let uiDriver: MockAnimationDriver;
beforeEach(() => { uiDriver = uiTestBed.get(AnimationDriver) as MockAnimationDriver; });
function retrieveFinalAnimationStepStyles(keyframes: any[]) { return keyframes[1][1]; }
@ -112,11 +112,11 @@ export function main() {
fixture.detectChanges();
flushMicrotasks();
var step1 = uiDriver.log.shift();
var step2 = uiDriver.log.shift();
const step1 = uiDriver.log.shift();
const step2 = uiDriver.log.shift();
var step1Styles = retrieveFinalAnimationStepStyles(step1['keyframeLookup']);
var step2Styles = retrieveFinalAnimationStepStyles(step2['keyframeLookup']);
const step1Styles = retrieveFinalAnimationStepStyles(step1['keyframeLookup']);
const step2Styles = retrieveFinalAnimationStepStyles(step2['keyframeLookup']);
expect(step1Styles).toEqual({fontSize: '20px'});
expect(step2Styles).toEqual({opacity: '1', fontSize: '50px'});
@ -126,8 +126,8 @@ export function main() {
fixture.detectChanges();
flushMicrotasks();
var step3 = uiDriver.log.shift();
var step3Styles = retrieveFinalAnimationStepStyles(step3['keyframeLookup']);
const step3 = uiDriver.log.shift();
const step3Styles = retrieveFinalAnimationStepStyles(step3['keyframeLookup']);
expect(step3Styles).toEqual({opacity: '0', fontSize: AUTO_STYLE});
}));
@ -136,7 +136,7 @@ export function main() {
const fixture = TestBed.createComponent(AnimationCmp);
const cmp = fixture.componentInstance;
var capturedEvent: AnimationTransitionEvent = null;
let capturedEvent: AnimationTransitionEvent = null;
cmp.stateStartFn = event => { capturedEvent = event; };
cmp.state = 'on';
@ -155,7 +155,7 @@ export function main() {
const fixture = TestBed.createComponent(AnimationCmp);
const cmp = fixture.componentInstance;
var capturedEvent: AnimationTransitionEvent = null;
let capturedEvent: AnimationTransitionEvent = null;
cmp.stateDoneFn = event => { capturedEvent = event; };
cmp.state = 'off';
@ -236,8 +236,8 @@ export function main() {
const cmp1 = f1.componentInstance;
const cmp2 = f2.componentInstance;
var cmp1Log: {[phaseName: string]: AnimationTransitionEvent} = {};
var cmp2Log: {[phaseName: string]: AnimationTransitionEvent} = {};
const cmp1Log: {[phaseName: string]: AnimationTransitionEvent} = {};
const cmp2Log: {[phaseName: string]: AnimationTransitionEvent} = {};
cmp1.stateStartFn = logFactory(cmp1Log, 'start');
cmp1.stateDoneFn = logFactory(cmp1Log, 'done');
@ -280,7 +280,7 @@ export function main() {
cmp.state = 'off';
fixture.detectChanges();
var player = <MockAnimationPlayer>uiDriver.log.shift()['player'];
const player = <MockAnimationPlayer>uiDriver.log.shift()['player'];
expect(player.log.indexOf('destroy') >= 0).toBe(false);
cmp.state = 'on';

45
modules/@angular/platform-webworker/test/web_workers/worker/renderer_integration_spec.ts
View File

@ -29,16 +29,16 @@ export function main() {
function createWebWorkerBrokerFactory(
messageBuses: PairedMessageBuses, workerSerializer: Serializer, uiSerializer: Serializer,
domRootRenderer: DomRootRenderer, uiRenderStore: RenderStore): ClientMessageBrokerFactory {
var uiMessageBus = messageBuses.ui;
var workerMessageBus = messageBuses.worker;
const uiMessageBus = messageBuses.ui;
const workerMessageBus = messageBuses.worker;
// set up the worker side
var webWorkerBrokerFactory =
const webWorkerBrokerFactory =
new ClientMessageBrokerFactory_(workerMessageBus, workerSerializer);
// set up the ui side
var uiMessageBrokerFactory = new ServiceMessageBrokerFactory_(uiMessageBus, uiSerializer);
var renderer = new MessageBasedRenderer(
const uiMessageBrokerFactory = new ServiceMessageBrokerFactory_(uiMessageBus, uiSerializer);
const renderer = new MessageBasedRenderer(
uiMessageBrokerFactory, uiMessageBus, uiSerializer, uiRenderStore, domRootRenderer);
renderer.start();
@ -48,10 +48,10 @@ export function main() {
function createWorkerRenderer(
workerSerializer: Serializer, uiSerializer: Serializer, domRootRenderer: DomRootRenderer,
uiRenderStore: RenderStore, workerRenderStore: RenderStore): RootRenderer {
var messageBuses = createPairedMessageBuses();
var brokerFactory = createWebWorkerBrokerFactory(
const messageBuses = createPairedMessageBuses();
const brokerFactory = createWebWorkerBrokerFactory(
messageBuses, workerSerializer, uiSerializer, domRootRenderer, uiRenderStore);
var workerRootRenderer = new WebWorkerRootRenderer(
const workerRootRenderer = new WebWorkerRootRenderer(
brokerFactory, messageBuses.worker, workerSerializer, workerRenderStore);
return new DebugDomRootRenderer(workerRootRenderer);
}
@ -60,13 +60,12 @@ export function main() {
// Don't run on server...
if (!getDOM().supportsDOMEvents()) return;
var uiInjector: Injector;
var uiRenderStore: RenderStore;
var workerRenderStore: RenderStore;
let uiRenderStore: RenderStore;
let workerRenderStore: RenderStore;
beforeEach(() => {
uiRenderStore = new RenderStore();
var testUiInjector = new TestBed();
const testUiInjector = new TestBed();
testUiInjector.platform = platformBrowserDynamicTesting();
testUiInjector.ngModule = BrowserTestingModule;
testUiInjector.configureTestingModule({
@ -76,8 +75,8 @@ export function main() {
{provide: RootRenderer, useExisting: DomRootRenderer}
]
});
var uiSerializer = testUiInjector.get(Serializer);
var domRootRenderer = testUiInjector.get(DomRootRenderer);
const uiSerializer = testUiInjector.get(Serializer);
const domRootRenderer = testUiInjector.get(DomRootRenderer);
workerRenderStore = new RenderStore();
TestBed.configureTestingModule({
@ -97,7 +96,7 @@ export function main() {
});
function getRenderElement(workerEl: any) {
var id = workerRenderStore.serialize(workerEl);
const id = workerRenderStore.serialize(workerEl);
return uiRenderStore.deserialize(id);
}
@ -109,7 +108,7 @@ export function main() {
TestBed.overrideComponent(MyComp2, {set: {template: '<div>{{ctxProp}}</div>'}});
const fixture = TestBed.createComponent(MyComp2);
var renderEl = getRenderElement(fixture.nativeElement);
const renderEl = getRenderElement(fixture.nativeElement);
expect(renderEl).toHaveText('');
fixture.componentInstance.ctxProp = 'Hello World!';
@ -123,10 +122,10 @@ export function main() {
MyComp2, {set: {template: '<input [title]="y" style="position:absolute">'}});
const fixture = TestBed.createComponent(MyComp2);
var checkSetters =
const checkSetters =
(componentRef: any /** TODO #9100 */, workerEl: any /** TODO #9100 */) => {
var renderer = getRenderer(componentRef);
var el = getRenderElement(workerEl);
const renderer = getRenderer(componentRef);
const el = getRenderElement(workerEl);
renderer.setElementProperty(workerEl, 'tabIndex', 1);
expect((<HTMLInputElement>el).tabIndex).toEqual(1);
@ -158,7 +157,7 @@ export function main() {
(<MyComp2>fixture.componentInstance).ctxBoolProp = true;
fixture.detectChanges();
var el = getRenderElement(fixture.nativeElement);
const el = getRenderElement(fixture.nativeElement);
expect(getDOM().getInnerHTML(el)).toContain('"ng-reflect-ng-if": "true"');
});
@ -167,7 +166,7 @@ export function main() {
MyComp2, {set: {template: '<template [ngIf]="ctxBoolProp">hello</template>'}});
const fixture = TestBed.createComponent(MyComp2);
var rootEl = getRenderElement(fixture.nativeElement);
const rootEl = getRenderElement(fixture.nativeElement);
expect(rootEl).toHaveText('');
fixture.componentInstance.ctxBoolProp = true;
@ -183,7 +182,7 @@ export function main() {
it('should call actions on the element', () => {
TestBed.overrideComponent(MyComp2, {set: {template: '<input [title]="y">'}});
const fixture = TestBed.createComponent(MyComp2);
var el = fixture.debugElement.children[0];
const el = fixture.debugElement.children[0];
getRenderer(fixture.componentRef).invokeElementMethod(el.nativeElement, 'setAttribute', [
'a', 'b'
]);
@ -196,7 +195,7 @@ export function main() {
TestBed.overrideComponent(MyComp2, {set: {template: '<input (change)="ctxNumProp = 1">'}});
const fixture = TestBed.createComponent(MyComp2);
var el = fixture.debugElement.children[0];
const el = fixture.debugElement.children[0];
dispatchEvent(getRenderElement(el.nativeElement), 'change');
expect(fixture.componentInstance.ctxNumProp).toBe(1);