From faf5d90bf6ef423195802978ceac97500e25dbd4 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Sun, 18 Sep 2016 16:15:43 -0700 Subject: [PATCH] refactor: remove dead code --- .../compiler/src/private_import_core.ts | 1 - .../src/change_detection/change_detection.ts | 2 +- .../core/src/change_detection/constants.ts | 19 ---------- .../@angular/core/src/core_private_export.ts | 4 --- modules/@angular/core/src/metadata/view.ts | 4 --- .../src/private_import_core.ts | 2 -- .../src/private_import_core.ts | 3 -- .../src/web_workers/shared/serializer.ts | 35 +++++++++++-------- 8 files changed, 21 insertions(+), 49 deletions(-) diff --git a/modules/@angular/compiler/src/private_import_core.ts b/modules/@angular/compiler/src/private_import_core.ts index 86e66c6730..8936e825f4 100644 --- a/modules/@angular/compiler/src/private_import_core.ts +++ b/modules/@angular/compiler/src/private_import_core.ts @@ -12,7 +12,6 @@ export const isDefaultChangeDetectionStrategy: typeof r.isDefaultChangeDetection r.isDefaultChangeDetectionStrategy; export type ChangeDetectorStatus = typeof r._ChangeDetectorStatus; export const ChangeDetectorStatus: typeof r.ChangeDetectorStatus = r.ChangeDetectorStatus; -r.CHANGE_DETECTION_STRATEGY_VALUES; export type LifecycleHooks = typeof r._LifecycleHooks; export const LifecycleHooks: typeof r.LifecycleHooks = r.LifecycleHooks; export const LIFECYCLE_HOOKS_VALUES: typeof r.LIFECYCLE_HOOKS_VALUES = r.LIFECYCLE_HOOKS_VALUES; diff --git a/modules/@angular/core/src/change_detection/change_detection.ts b/modules/@angular/core/src/change_detection/change_detection.ts index 56f8a26571..14f8c2de3e 100644 --- a/modules/@angular/core/src/change_detection/change_detection.ts +++ b/modules/@angular/core/src/change_detection/change_detection.ts @@ -14,7 +14,7 @@ import {KeyValueDifferFactory, KeyValueDiffers} from './differs/keyvalue_differs export {SimpleChanges} from '../metadata/lifecycle_hooks'; export {SimpleChange, UNINITIALIZED, ValueUnwrapper, WrappedValue, devModeEqual, looseIdentical} from './change_detection_util'; export {ChangeDetectorRef} from './change_detector_ref'; -export {CHANGE_DETECTION_STRATEGY_VALUES, ChangeDetectionStrategy, ChangeDetectorStatus, isDefaultChangeDetectionStrategy} from './constants'; +export {ChangeDetectionStrategy, ChangeDetectorStatus, isDefaultChangeDetectionStrategy} from './constants'; export {CollectionChangeRecord, DefaultIterableDifferFactory} from './differs/default_iterable_differ'; export {DefaultIterableDiffer} from './differs/default_iterable_differ'; export {DefaultKeyValueDifferFactory, KeyValueChangeRecord} from './differs/default_keyvalue_differ'; diff --git a/modules/@angular/core/src/change_detection/constants.ts b/modules/@angular/core/src/change_detection/constants.ts index 3caee2fd47..123411c89c 100644 --- a/modules/@angular/core/src/change_detection/constants.ts +++ b/modules/@angular/core/src/change_detection/constants.ts @@ -66,25 +66,6 @@ export enum ChangeDetectorStatus { Destroyed, } -/** - * List of possible {@link ChangeDetectionStrategy} values. - */ -export var CHANGE_DETECTION_STRATEGY_VALUES = [ - ChangeDetectionStrategy.OnPush, - ChangeDetectionStrategy.Default, -]; -/** - * List of possible {@link ChangeDetectorStatus} values. - */ -export var CHANGE_DETECTOR_STATUS_VALUES = [ - ChangeDetectorStatus.CheckOnce, - ChangeDetectorStatus.Checked, - ChangeDetectorStatus.CheckAlways, - ChangeDetectorStatus.Detached, - ChangeDetectorStatus.Errored, - ChangeDetectorStatus.Destroyed, -]; - export function isDefaultChangeDetectionStrategy(changeDetectionStrategy: ChangeDetectionStrategy): boolean { return isBlank(changeDetectionStrategy) || diff --git a/modules/@angular/core/src/core_private_export.ts b/modules/@angular/core/src/core_private_export.ts index 980ec38066..6367f7bb32 100644 --- a/modules/@angular/core/src/core_private_export.ts +++ b/modules/@angular/core/src/core_private_export.ts @@ -44,7 +44,6 @@ export var __core_private__: { isDefaultChangeDetectionStrategy: typeof constants.isDefaultChangeDetectionStrategy, ChangeDetectorStatus: typeof constants.ChangeDetectorStatus, _ChangeDetectorStatus?: constants.ChangeDetectorStatus, - CHANGE_DETECTION_STRATEGY_VALUES: typeof constants.CHANGE_DETECTION_STRATEGY_VALUES, constructDependencies: typeof reflective_provider.constructDependencies, LifecycleHooks: typeof lifecycle_hooks.LifecycleHooks, _LifecycleHooks?: lifecycle_hooks.LifecycleHooks, @@ -69,7 +68,6 @@ export var __core_private__: { flattenNestedViewRenderNodes: typeof view_utils.flattenNestedViewRenderNodes, interpolate: typeof view_utils.interpolate, ViewUtils: typeof view_utils.ViewUtils, _ViewUtils?: view_utils.ViewUtils, - VIEW_ENCAPSULATION_VALUES: typeof metadata_view.VIEW_ENCAPSULATION_VALUES, ViewMetadata: typeof metadata_view.ViewMetadata, _ViewMetadata?: metadata_view.ViewMetadata, DebugContext: typeof debug_context.DebugContext, _DebugContext?: debug_context.DebugContext, StaticNodeDebugInfo: typeof debug_context.StaticNodeDebugInfo, @@ -124,7 +122,6 @@ export var __core_private__: { } = { isDefaultChangeDetectionStrategy: constants.isDefaultChangeDetectionStrategy, ChangeDetectorStatus: constants.ChangeDetectorStatus, - CHANGE_DETECTION_STRATEGY_VALUES: constants.CHANGE_DETECTION_STRATEGY_VALUES, constructDependencies: reflective_provider.constructDependencies, LifecycleHooks: lifecycle_hooks.LifecycleHooks, LIFECYCLE_HOOKS_VALUES: lifecycle_hooks.LIFECYCLE_HOOKS_VALUES, @@ -141,7 +138,6 @@ export var __core_private__: { flattenNestedViewRenderNodes: view_utils.flattenNestedViewRenderNodes, interpolate: view_utils.interpolate, ViewUtils: view_utils.ViewUtils, - VIEW_ENCAPSULATION_VALUES: metadata_view.VIEW_ENCAPSULATION_VALUES, ViewMetadata: metadata_view.ViewMetadata, DebugContext: debug_context.DebugContext, StaticNodeDebugInfo: debug_context.StaticNodeDebugInfo, diff --git a/modules/@angular/core/src/metadata/view.ts b/modules/@angular/core/src/metadata/view.ts index c1e28b8ddd..bbf962e327 100644 --- a/modules/@angular/core/src/metadata/view.ts +++ b/modules/@angular/core/src/metadata/view.ts @@ -37,10 +37,6 @@ export enum ViewEncapsulation { None } -export var VIEW_ENCAPSULATION_VALUES = - [ViewEncapsulation.Emulated, ViewEncapsulation.Native, ViewEncapsulation.None]; - - /** * Metadata properties available for configuring Views. * diff --git a/modules/@angular/platform-browser/src/private_import_core.ts b/modules/@angular/platform-browser/src/private_import_core.ts index 9bd81b4360..f2512b86fb 100644 --- a/modules/@angular/platform-browser/src/private_import_core.ts +++ b/modules/@angular/platform-browser/src/private_import_core.ts @@ -12,8 +12,6 @@ export type RenderDebugInfo = typeof r._RenderDebugInfo; export var RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo; export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities; -export var VIEW_ENCAPSULATION_VALUES: typeof r.VIEW_ENCAPSULATION_VALUES = - r.VIEW_ENCAPSULATION_VALUES; export type DebugDomRootRenderer = typeof r._DebugDomRootRenderer; export var DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer; diff --git a/modules/@angular/platform-webworker/src/private_import_core.ts b/modules/@angular/platform-webworker/src/private_import_core.ts index 48a3322b5d..f2512b86fb 100644 --- a/modules/@angular/platform-webworker/src/private_import_core.ts +++ b/modules/@angular/platform-webworker/src/private_import_core.ts @@ -13,9 +13,6 @@ export var RenderDebugInfo: typeof r.RenderDebugInfo = r.RenderDebugInfo; export var ReflectionCapabilities: typeof r.ReflectionCapabilities = r.ReflectionCapabilities; -export var VIEW_ENCAPSULATION_VALUES: typeof r.VIEW_ENCAPSULATION_VALUES = - r.VIEW_ENCAPSULATION_VALUES; - export type DebugDomRootRenderer = typeof r._DebugDomRootRenderer; export var DebugDomRootRenderer: typeof r.DebugDomRootRenderer = r.DebugDomRootRenderer; export var reflector: typeof r.reflector = r.reflector; diff --git a/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts b/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts index 17c9ab2e00..accb8bab1e 100644 --- a/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts +++ b/modules/@angular/platform-webworker/src/web_workers/shared/serializer.ts @@ -9,7 +9,6 @@ import {Injectable, RenderComponentType, Type, ViewEncapsulation} from '@angular/core'; import {isArray, isPresent} from '../../facade/lang'; -import {VIEW_ENCAPSULATION_VALUES} from '../../private_import_core'; import {RenderStore} from './render_store'; import {LocationType} from './serialized_types'; @@ -54,26 +53,32 @@ export class Serializer { if (!isPresent(map)) { return null; } - if (isArray(map)) { - var obj: any[] = []; - (map).forEach(val => obj.push(this.deserialize(val, type, data))); - return obj; + + if (Array.isArray(map)) { + return (map).map(val => this.deserialize(val, type, data)); } - if (type == PRIMITIVE) { + + if (type === PRIMITIVE) { return map; } - if (type == RenderStoreObject) { + if (type === RenderStoreObject) { return this._renderStore.deserialize(map); - } else if (type === RenderComponentType) { - return this._deserializeRenderComponentType(map); - } else if (type === ViewEncapsulation) { - return VIEW_ENCAPSULATION_VALUES[map]; - } else if (type === LocationType) { - return this._deserializeLocation(map); - } else { - throw new Error('No deserializer for ' + type.toString()); } + + if (type === RenderComponentType) { + return this._deserializeRenderComponentType(map); + } + + if (type === ViewEncapsulation) { + return map as ViewEncapsulation; + } + + if (type === LocationType) { + return this._deserializeLocation(map); + } + + throw new Error('No deserializer for ' + type.toString()); } private _serializeLocation(loc: LocationType): Object {