refactor(): use const and let instead of var

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

View File

@ -65,15 +65,15 @@ export class ClientMessageBroker_ extends ClientMessageBroker {
super();
this._sink = messageBus.to(channel);
this._serializer = _serializer;
var source = messageBus.from(channel);
const source = messageBus.from(channel);
source.subscribe({next: (message: {[key: string]: any}) => this._handleMessage(message)});
}
private _generateMessageId(name: string): string {
var time: string = stringify(new Date().getTime());
var iteration: number = 0;
var id: string = name + time + stringify(iteration);
const time: string = stringify(new Date().getTime());
let iteration: number = 0;
let id: string = name + time + stringify(iteration);
while (isPresent((this as any /** TODO #9100 */)._pending[id])) {
id = `${name}${time}${iteration}`;
iteration++;
@ -82,7 +82,7 @@ export class ClientMessageBroker_ extends ClientMessageBroker {
}
runOnService(args: UiArguments, returnType: Type<any>): Promise<any> {
var fnArgs: any[] /** TODO #9100 */ = [];
const fnArgs: any[] /** TODO #9100 */ = [];
if (isPresent(args.args)) {
args.args.forEach(argument => {
if (argument.type != null) {
@ -93,8 +93,8 @@ export class ClientMessageBroker_ extends ClientMessageBroker {
});
}
var promise: Promise<any>;
var id: string = null;
let promise: Promise<any>;
let id: string = null;
if (returnType != null) {
let completer: PromiseCompleter;
promise = new Promise((resolve, reject) => { completer = {resolve, reject}; });
@ -117,7 +117,7 @@ export class ClientMessageBroker_ extends ClientMessageBroker {
}
// TODO(jteplitz602): Create a class for these messages so we don't keep using StringMap #3685
var message = {'method': args.method, 'args': fnArgs};
const message = {'method': args.method, 'args': fnArgs};
if (id != null) {
(message as any /** TODO #9100 */)['id'] = id;
}
@ -127,10 +127,10 @@ export class ClientMessageBroker_ extends ClientMessageBroker {
}
private _handleMessage(message: {[key: string]: any}): void {
var data = new MessageData(message);
const data = new MessageData(message);
// TODO(jteplitz602): replace these strings with messaging constants #3685
if (data.type === 'result' || data.type === 'error') {
var id = data.id;
const id = data.id;
if (this._pending.has(id)) {
if (data.type === 'result') {
this._pending.get(id).resolve(data.value);

View File

@ -37,11 +37,11 @@ export class PostMessageBusSink implements MessageBusSink {
throw new Error(`${channel} has already been initialized`);
}
var emitter = new EventEmitter(false);
var channelInfo = new _Channel(emitter, runInZone);
const emitter = new EventEmitter(false);
const channelInfo = new _Channel(emitter, runInZone);
this._channels[channel] = channelInfo;
emitter.subscribe((data: Object) => {
var message = {channel: channel, message: data};
const message = {channel: channel, message: data};
if (runInZone) {
this._messageBuffer.push(message);
} else {
@ -89,8 +89,8 @@ export class PostMessageBusSource implements MessageBusSource {
throw new Error(`${channel} has already been initialized`);
}
var emitter = new EventEmitter(false);
var channelInfo = new _Channel(emitter, runInZone);
const emitter = new EventEmitter(false);
const channelInfo = new _Channel(emitter, runInZone);
this._channels[channel] = channelInfo;
}
@ -103,16 +103,16 @@ export class PostMessageBusSource implements MessageBusSource {
}
private _handleMessages(ev: MessageEvent): void {
var messages = ev.data;
for (var i = 0; i < messages.length; i++) {
const messages = ev.data;
for (let i = 0; i < messages.length; i++) {
this._handleMessage(messages[i]);
}
}
private _handleMessage(data: any): void {
var channel = data.channel;
const channel = data.channel;
if (this._channels.hasOwnProperty(channel)) {
var channelInfo = this._channels[channel];
const channelInfo = this._channels[channel];
if (channelInfo.runInZone) {
this._zone.run(() => { channelInfo.emitter.emit(data.message); });
} else {

View File

@ -27,7 +27,7 @@ export class RenderStore {
}
remove(obj: any): void {
var index = this._lookupByObject.get(obj);
const index = this._lookupByObject.get(obj);
this._lookupByObject.delete(obj);
this._lookupById.delete(index);
}

View File

@ -61,7 +61,7 @@ export class ServiceMessageBroker_ extends ServiceMessageBroker {
public channel: any /** TODO #9100 */) {
super();
this._sink = messageBus.to(channel);
var source = messageBus.from(channel);
const source = messageBus.from(channel);
source.subscribe({next: (message: any) => this._handleMessage(message)});
}
@ -70,7 +70,7 @@ export class ServiceMessageBroker_ extends ServiceMessageBroker {
returnType?: Type<any>): void {
this._methods.set(methodName, (message: ReceivedMessage) => {
const serializedArgs = message.args;
let numArgs = signature === null ? 0 : signature.length;
const numArgs = signature === null ? 0 : signature.length;
const deserializedArgs: any[] = new Array(numArgs);
for (let i = 0; i < numArgs; i++) {
const serializedArg = serializedArgs[i];
@ -85,7 +85,7 @@ export class ServiceMessageBroker_ extends ServiceMessageBroker {
}
private _handleMessage(map: {[key: string]: any}): void {
var message = new ReceivedMessage(map);
const message = new ReceivedMessage(map);
if (this._methods.has(message.method)) {
this._methods.get(message.method)(message);
}

View File

@ -23,7 +23,7 @@ export class EventDispatcher {
}
dispatchRenderEvent(element: any, eventTarget: string, eventName: string, event: any): boolean {
var serializedEvent: any /** TODO #9100 */;
let serializedEvent: any /** TODO #9100 */;
// TODO (jteplitz602): support custom events #3350
switch (event.type) {
case 'click':

View File

@ -30,7 +30,7 @@ export function serializeGenericEvent(e: Event): {[key: string]: any} {
// TODO(jteplitz602): Allow users to specify the properties they need rather than always
// adding value and files #3374
export function serializeEventWithTarget(e: Event): {[key: string]: any} {
var serializedEvent = serializeEvent(e, EVENT_PROPERTIES);
const serializedEvent = serializeEvent(e, EVENT_PROPERTIES);
return addTarget(e, serializedEvent);
}
@ -39,19 +39,19 @@ export function serializeMouseEvent(e: MouseEvent): {[key: string]: any} {
}
export function serializeKeyboardEvent(e: KeyboardEvent): {[key: string]: any} {
var serializedEvent = serializeEvent(e, KEYBOARD_EVENT_PROPERTIES);
const serializedEvent = serializeEvent(e, KEYBOARD_EVENT_PROPERTIES);
return addTarget(e, serializedEvent);
}
export function serializeTransitionEvent(e: TransitionEvent): {[key: string]: any} {
var serializedEvent = serializeEvent(e, TRANSITION_EVENT_PROPERTIES);
const serializedEvent = serializeEvent(e, TRANSITION_EVENT_PROPERTIES);
return addTarget(e, serializedEvent);
}
// TODO(jteplitz602): #3374. See above.
function addTarget(e: Event, serializedEvent: {[key: string]: any}): {[key: string]: any} {
if (NODES_WITH_VALUE.has((<HTMLElement>e.target).tagName.toLowerCase())) {
var target = <HTMLInputElement>e.target;
const target = <HTMLInputElement>e.target;
serializedEvent['target'] = {'value': target.value};
if (target.files) {
serializedEvent['target']['files'] = target.files;
@ -61,9 +61,9 @@ function addTarget(e: Event, serializedEvent: {[key: string]: any}): {[key: stri
}
function serializeEvent(e: any, properties: string[]): {[key: string]: any} {
var serialized = {};
for (var i = 0; i < properties.length; i++) {
var prop = properties[i];
const serialized = {};
for (let i = 0; i < properties.length; i++) {
const prop = properties[i];
(serialized as any /** TODO #9100 */)[prop] = e[prop];
}
return serialized;

View File

@ -25,7 +25,7 @@ export const WORKER_UI_LOCATION_PROVIDERS: Provider[] = [
function initUiLocation(injector: Injector): () => void {
return () => {
let zone = injector.get(NgZone);
const zone = injector.get(NgZone);
zone.runGuarded(() => injector.get(MessageBasedPlatformLocation).start());
};

View File

@ -54,8 +54,8 @@ export class MessageBasedPlatformLocation {
private _sendUrlChangeEvent(e: Event): void {
let loc = this._serializer.serialize(this._platformLocation.location, LocationType);
let serializedEvent = {'type': e.type};
const loc = this._serializer.serialize(this._platformLocation.location, LocationType);
const serializedEvent = {'type': e.type};
this._channelSink.emit({'event': serializedEvent, 'location': loc});
}

View File

@ -24,7 +24,7 @@ export class MessageBasedRenderer {
private _rootRenderer: RootRenderer) {}
start(): void {
var broker = this._brokerFactory.createMessageBroker(RENDERER_CHANNEL);
const broker = this._brokerFactory.createMessageBroker(RENDERER_CHANNEL);
this._bus.initChannel(EVENT_CHANNEL);
this._eventDispatcher = new EventDispatcher(this._bus.to(EVENT_CHANNEL), this._serializer);
@ -228,7 +228,7 @@ export class MessageBasedRenderer {
}
private _listen(renderer: Renderer, renderElement: any, eventName: string, unlistenId: number) {
var unregisterCallback = renderer.listen(
const unregisterCallback = renderer.listen(
renderElement, eventName,
(event: any /** TODO #9100 */) =>
this._eventDispatcher.dispatchRenderEvent(renderElement, null, eventName, event));
@ -237,7 +237,7 @@ export class MessageBasedRenderer {
private _listenGlobal(
renderer: Renderer, eventTarget: string, eventName: string, unlistenId: number) {
var unregisterCallback = renderer.listenGlobal(
const unregisterCallback = renderer.listenGlobal(
eventTarget, eventName,
(event: any /** TODO #9100 */) =>
this._eventDispatcher.dispatchRenderEvent(null, eventTarget, eventName, event));
@ -249,7 +249,7 @@ export class MessageBasedRenderer {
private _animate(
renderer: Renderer, element: any, startingStyles: any, keyframes: any[], duration: number,
delay: number, easing: string, playerId: any) {
var player = renderer.animate(element, startingStyles, keyframes, duration, delay, easing);
const player = renderer.animate(element, startingStyles, keyframes, duration, delay, easing);
this._renderStore.store(player, playerId);
}

View File

@ -34,9 +34,9 @@ export class WebWorkerPlatformLocation extends PlatformLocation {
this._channelSource = bus.from(ROUTER_CHANNEL);
this._channelSource.subscribe({
next: (msg: {[key: string]: any}) => {
var listeners: Array<Function> = null;
let listeners: Array<Function> = null;
if (msg.hasOwnProperty('event')) {
let type: string = msg['event']['type'];
const type: string = msg['event']['type'];
if (type === 'popstate') {
listeners = this._popStateListeners;
} else if (type === 'hashchange') {
@ -44,7 +44,7 @@ export class WebWorkerPlatformLocation extends PlatformLocation {
}
if (listeners !== null) {
let e = deserializeGenericEvent(msg['event']);
const e = deserializeGenericEvent(msg['event']);
// There was a popState or hashChange event, so the location object thas been updated
this._location = this._serializer.deserialize(msg['location'], LocationType);
listeners.forEach((fn: Function) => fn(e));
@ -56,9 +56,9 @@ export class WebWorkerPlatformLocation extends PlatformLocation {
/** @internal **/
init(): Promise<boolean> {
var args: UiArguments = new UiArguments('getLocation');
const args: UiArguments = new UiArguments('getLocation');
var locationPromise: Promise<LocationType> = this._broker.runOnService(args, LocationType);
const locationPromise: Promise<LocationType> = this._broker.runOnService(args, LocationType);
return locationPromise.then(
(val: LocationType):
boolean => {
@ -108,32 +108,32 @@ export class WebWorkerPlatformLocation extends PlatformLocation {
this._location.pathname = newPath;
var fnArgs = [new FnArg(newPath, PRIMITIVE)];
var args = new UiArguments('setPathname', fnArgs);
const fnArgs = [new FnArg(newPath, PRIMITIVE)];
const args = new UiArguments('setPathname', fnArgs);
this._broker.runOnService(args, null);
}
pushState(state: any, title: string, url: string): void {
var fnArgs =
const fnArgs =
[new FnArg(state, PRIMITIVE), new FnArg(title, PRIMITIVE), new FnArg(url, PRIMITIVE)];
var args = new UiArguments('pushState', fnArgs);
const args = new UiArguments('pushState', fnArgs);
this._broker.runOnService(args, null);
}
replaceState(state: any, title: string, url: string): void {
var fnArgs =
const fnArgs =
[new FnArg(state, PRIMITIVE), new FnArg(title, PRIMITIVE), new FnArg(url, PRIMITIVE)];
var args = new UiArguments('replaceState', fnArgs);
const args = new UiArguments('replaceState', fnArgs);
this._broker.runOnService(args, null);
}
forward(): void {
var args = new UiArguments('forward');
const args = new UiArguments('forward');
this._broker.runOnService(args, null);
}
back(): void {
var args = new UiArguments('back');
const args = new UiArguments('back');
this._broker.runOnService(args, null);
}
}

View File

@ -30,22 +30,22 @@ export class WebWorkerRootRenderer implements RootRenderer {
private _serializer: Serializer, public renderStore: RenderStore) {
this._messageBroker = messageBrokerFactory.createMessageBroker(RENDERER_CHANNEL);
bus.initChannel(EVENT_CHANNEL);
var source = bus.from(EVENT_CHANNEL);
const source = bus.from(EVENT_CHANNEL);
source.subscribe({next: (message: any) => this._dispatchEvent(message)});
}
private _dispatchEvent(message: {[key: string]: any}): void {
var element =
const element =
<WebWorkerRenderNode>this._serializer.deserialize(message['element'], RenderStoreObject);
var playerData = message['animationPlayer'];
const playerData = message['animationPlayer'];
if (playerData) {
var phaseName = message['phaseName'];
var player = <AnimationPlayer>this._serializer.deserialize(playerData, RenderStoreObject);
const phaseName = message['phaseName'];
const player = <AnimationPlayer>this._serializer.deserialize(playerData, RenderStoreObject);
element.animationPlayerEvents.dispatchEvent(player, phaseName);
} else {
var eventName = message['eventName'];
var target = message['eventTarget'];
var event = deserializeGenericEvent(message['event']);
const eventName = message['eventName'];
const target = message['eventTarget'];
const event = deserializeGenericEvent(message['event']);
if (isPresent(target)) {
this.globalEvents.dispatchEvent(eventNameWithTarget(target, eventName), event);
} else {
@ -55,11 +55,11 @@ export class WebWorkerRootRenderer implements RootRenderer {
}
renderComponent(componentType: RenderComponentType): Renderer {
var result = this._componentRenderers.get(componentType.id);
let result = this._componentRenderers.get(componentType.id);
if (!result) {
result = new WebWorkerRenderer(this, componentType);
this._componentRenderers.set(componentType.id, result);
var id = this.renderStore.allocateId();
const id = this.renderStore.allocateId();
this.renderStore.store(result, id);
this.runOnService('renderComponent', [
new FnArg(componentType, RenderComponentType),
@ -70,13 +70,13 @@ export class WebWorkerRootRenderer implements RootRenderer {
}
runOnService(fnName: string, fnArgs: FnArg[]) {
var args = new UiArguments(fnName, fnArgs);
const args = new UiArguments(fnName, fnArgs);
this._messageBroker.runOnService(args, null);
}
allocateNode(): WebWorkerRenderNode {
var result = new WebWorkerRenderNode();
var id = this.renderStore.allocateId();
const result = new WebWorkerRenderNode();
const id = this.renderStore.allocateId();
this.renderStore.store(result, id);
return result;
}
@ -84,7 +84,7 @@ export class WebWorkerRootRenderer implements RootRenderer {
allocateId(): number { return this.renderStore.allocateId(); }
destroyNodes(nodes: any[]) {
for (var i = 0; i < nodes.length; i++) {
for (let i = 0; i < nodes.length; i++) {
this.renderStore.remove(nodes[i]);
}
}
@ -95,19 +95,19 @@ export class WebWorkerRenderer implements Renderer, RenderStoreObject {
private _rootRenderer: WebWorkerRootRenderer, private _componentType: RenderComponentType) {}
private _runOnService(fnName: string, fnArgs: FnArg[]) {
var fnArgsWithRenderer = [new FnArg(this, RenderStoreObject)].concat(fnArgs);
const fnArgsWithRenderer = [new FnArg(this, RenderStoreObject)].concat(fnArgs);
this._rootRenderer.runOnService(fnName, fnArgsWithRenderer);
}
selectRootElement(selectorOrNode: string, debugInfo?: RenderDebugInfo): any {
var node = this._rootRenderer.allocateNode();
const node = this._rootRenderer.allocateNode();
this._runOnService(
'selectRootElement', [new FnArg(selectorOrNode, null), new FnArg(node, RenderStoreObject)]);
return node;
}
createElement(parentElement: any, name: string, debugInfo?: RenderDebugInfo): any {
var node = this._rootRenderer.allocateNode();
const node = this._rootRenderer.allocateNode();
this._runOnService('createElement', [
new FnArg(parentElement, RenderStoreObject), new FnArg(name, null),
new FnArg(node, RenderStoreObject)
@ -116,7 +116,7 @@ export class WebWorkerRenderer implements Renderer, RenderStoreObject {
}
createViewRoot(hostElement: any): any {
var viewRoot = this._componentType.encapsulation === ViewEncapsulation.Native ?
const viewRoot = this._componentType.encapsulation === ViewEncapsulation.Native ?
this._rootRenderer.allocateNode() :
hostElement;
this._runOnService(
@ -126,7 +126,7 @@ export class WebWorkerRenderer implements Renderer, RenderStoreObject {
}
createTemplateAnchor(parentElement: any, debugInfo?: RenderDebugInfo): any {
var node = this._rootRenderer.allocateNode();
const node = this._rootRenderer.allocateNode();
this._runOnService(
'createTemplateAnchor',
[new FnArg(parentElement, RenderStoreObject), new FnArg(node, RenderStoreObject)]);
@ -134,7 +134,7 @@ export class WebWorkerRenderer implements Renderer, RenderStoreObject {
}
createText(parentElement: any, value: string, debugInfo?: RenderDebugInfo): any {
var node = this._rootRenderer.allocateNode();
const node = this._rootRenderer.allocateNode();
this._runOnService('createText', [
new FnArg(parentElement, RenderStoreObject), new FnArg(value, null),
new FnArg(node, RenderStoreObject)
@ -214,7 +214,7 @@ export class WebWorkerRenderer implements Renderer, RenderStoreObject {
listen(renderElement: WebWorkerRenderNode, name: string, callback: Function): Function {
renderElement.events.listen(name, callback);
var unlistenCallbackId = this._rootRenderer.allocateId();
const unlistenCallbackId = this._rootRenderer.allocateId();
this._runOnService('listen', [
new FnArg(renderElement, RenderStoreObject), new FnArg(name, null),
new FnArg(unlistenCallbackId, null)
@ -227,7 +227,7 @@ export class WebWorkerRenderer implements Renderer, RenderStoreObject {
listenGlobal(target: string, name: string, callback: Function): Function {
this._rootRenderer.globalEvents.listen(eventNameWithTarget(target, name), callback);
var unlistenCallbackId = this._rootRenderer.allocateId();
const unlistenCallbackId = this._rootRenderer.allocateId();
this._runOnService(
'listenGlobal',
[new FnArg(target, null), new FnArg(name, null), new FnArg(unlistenCallbackId, null)]);
@ -262,7 +262,7 @@ export class NamedEventEmitter {
if (!this._listeners) {
this._listeners = new Map<string, Function[]>();
}
var listeners = this._listeners.get(eventName);
let listeners = this._listeners.get(eventName);
if (!listeners) {
listeners = [];
this._listeners.set(eventName, listeners);
@ -277,8 +277,8 @@ export class NamedEventEmitter {
}
dispatchEvent(eventName: string, event: any) {
var listeners = this._getListeners(eventName);
for (var i = 0; i < listeners.length; i++) {
const listeners = this._getListeners(eventName);
for (let i = 0; i < listeners.length; i++) {
listeners[i](event);
}
}
@ -291,11 +291,11 @@ export class AnimationPlayerEmitter {
if (!this._listeners) {
this._listeners = new Map<AnimationPlayer, {[phaseName: string]: Function[]}>();
}
var phaseMap = this._listeners.get(player);
let phaseMap = this._listeners.get(player);
if (!phaseMap) {
this._listeners.set(player, phaseMap = {});
}
var phaseFns = phaseMap[phaseName];
let phaseFns = phaseMap[phaseName];
if (!phaseFns) {
phaseFns = phaseMap[phaseName] = [];
}
@ -309,8 +309,8 @@ export class AnimationPlayerEmitter {
unlisten(player: AnimationPlayer) { this._listeners.delete(player); }
dispatchEvent(player: AnimationPlayer, phaseName: string) {
var listeners = this._getListeners(player, phaseName);
for (var i = 0; i < listeners.length; i++) {
const listeners = this._getListeners(player, phaseName);
for (let i = 0; i < listeners.length; i++) {
listeners[i]();
}
}
@ -335,7 +335,7 @@ class _AnimationWorkerRendererPlayer implements AnimationPlayer, RenderStoreObje
private _runOnService(fnName: string, fnArgs: FnArg[]) {
if (!this._destroyed) {
var fnArgsWithRenderer = [
const fnArgsWithRenderer = [
new FnArg(this, RenderStoreObject), new FnArg(this._renderElement, RenderStoreObject)
].concat(fnArgs);
this._rootRenderer.runOnService(ANIMATION_WORKER_PLAYER_PREFIX + fnName, fnArgsWithRenderer);

View File

@ -33,7 +33,7 @@ export function errorHandler(): ErrorHandler {
// TODO(jteplitz602) remove this and compile with lib.webworker.d.ts (#3492)
let _postMessage = {
const _postMessage = {
postMessage: (message: any, transferrables?: [ArrayBuffer]) => {
(<any>postMessage)(message, transferrables);
}
@ -41,9 +41,9 @@ let _postMessage = {
export function createMessageBus(zone: NgZone): MessageBus {
let sink = new PostMessageBusSink(_postMessage);
let source = new PostMessageBusSource();
let bus = new PostMessageBus(sink, source);
const sink = new PostMessageBusSink(_postMessage);
const source = new PostMessageBusSource();
const bus = new PostMessageBus(sink, source);
bus.attachToZone(zone);
return bus;
}

View File

@ -91,12 +91,12 @@ export const _WORKER_UI_PLATFORM_PROVIDERS: Provider[] = [
];
function initializeGenericWorkerRenderer(injector: Injector) {
var bus = injector.get(MessageBus);
let zone = injector.get(NgZone);
const bus = injector.get(MessageBus);
const zone = injector.get(NgZone);
bus.attachToZone(zone);
// initialize message services after the bus has been created
let services = injector.get(WORKER_UI_STARTABLE_MESSAGING_SERVICE);
const services = injector.get(WORKER_UI_STARTABLE_MESSAGING_SERVICE);
zone.runGuarded(() => { services.forEach((svc: any) => { svc.start(); }); });
}
@ -108,7 +108,7 @@ function initWebWorkerRenderPlatform(injector: Injector): () => void {
return () => {
BrowserDomAdapter.makeCurrent();
BrowserGetTestability.init();
var scriptUri: string;
let scriptUri: string;
try {
scriptUri = injector.get(WORKER_SCRIPT);
} catch (e) {
@ -116,7 +116,7 @@ function initWebWorkerRenderPlatform(injector: Injector): () => void {
'You must provide your WebWorker\'s initialization script with the WORKER_SCRIPT token');
}
let instance = injector.get(WebWorkerInstance);
const instance = injector.get(WebWorkerInstance);
spawnWebWorker(scriptUri, instance);
initializeGenericWorkerRenderer(injector);
@ -145,10 +145,10 @@ function createNgZone(): NgZone {
* Spawns a new class and initializes the WebWorkerInstance
*/
function spawnWebWorker(uri: string, instance: WebWorkerInstance): void {
var webWorker: Worker = new Worker(uri);
var sink = new PostMessageBusSink(webWorker);
var source = new PostMessageBusSource(webWorker);
var bus = new PostMessageBus(sink, source);
const webWorker: Worker = new Worker(uri);
const sink = new PostMessageBusSink(webWorker);
const source = new PostMessageBusSource(webWorker);
const bus = new PostMessageBus(sink, source);
instance.init(webWorker, bus);
}