chore(lint): enable duplicateModuleImport tslint check

This commit is contained in:
Alex Eagle
2016-05-26 15:07:51 -07:00
parent 5f999225ba
commit 2019050db2
20 changed files with 46 additions and 57 deletions

View File

@ -1,23 +1,18 @@
import {ListWrapper, StringMapWrapper} from '../facade/collection';
import {Math} from '../facade/math';
import {ANY_STATE, EMPTY_STATE} from '../../core_private';
import {ANY_STATE, FILL_STYLE_FLAG} from '../../core_private';
import {
IS_DART,
RegExpWrapper,
isArray,
isPresent,
isBlank,
isNumber,
isString,
isStringMap,
NumberWrapper
} from '../facade/lang';
import {FILL_STYLE_FLAG} from '../../core_private';
import {
CompileAnimationEntryMetadata,
CompileAnimationStateMetadata,
CompileAnimationStateDeclarationMetadata,
CompileAnimationStateTransitionMetadata,
CompileAnimationMetadata,
@ -32,7 +27,6 @@ import {
import {
AnimationAst,
AnimationEntryAst,
AnimationStateAst,
AnimationStateTransitionAst,
AnimationStateDeclarationAst,
AnimationKeyframeAst,

View File

@ -1,10 +1,10 @@
import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
import {reflector} from '../core_private';
import {
CHANGE_DETECTION_STRATEGY_VALUES,
VIEW_ENCAPSULATION_VALUES,
LifecycleHooks,
LIFECYCLE_HOOKS_VALUES
LIFECYCLE_HOOKS_VALUES,
reflector
} from '../core_private';
import {

View File

@ -11,7 +11,6 @@ import {
ViewEncapsulation,
TemplateRef
} from '@angular/core';
import {SecurityContext} from '../core_private';
import {
AppElement,
AppView,
@ -22,7 +21,6 @@ import {
devModeEqual,
flattenNestedViewRenderNodes,
interpolate,
RenderDebugInfo,
StaticNodeDebugInfo,
TemplateRef_,
uninitialized,
@ -47,7 +45,8 @@ import {
NoOpAnimationPlayer as NoOpAnimationPlayer_,
AnimationGroupPlayer as AnimationGroupPlayer_,
AnimationSequencePlayer as AnimationSequencePlayer_,
AnimationStyleUtil
AnimationStyleUtil,
SecurityContext
} from '../core_private';
import {CompileIdentifierMetadata, CompileTokenMetadata} from './compile_metadata';

View File

@ -1,4 +1,14 @@
import {
AnimationMetadata,
AnimationEntryMetadata,
AnimationStateMetadata,
AnimationStateDeclarationMetadata,
AnimationStateTransitionMetadata,
AnimationStyleMetadata,
AnimationKeyframesSequenceMetadata,
AnimationAnimateMetadata,
AnimationWithStepsMetadata,
AnimationGroupMetadata,
AttributeMetadata,
OptionalMetadata,
ComponentMetadata,
@ -30,7 +40,6 @@ import {
import {StringMapWrapper} from '../src/facade/collection';
import {BaseException} from '../src/facade/exceptions';
import * as cpl from './compile_metadata';
import * as anmd from '@angular/core';
import {DirectiveResolver} from './directive_resolver';
import {PipeResolver} from './pipe_resolver';
import {ViewResolver} from './view_resolver';
@ -75,36 +84,36 @@ export class CompileMetadataResolver {
return sanitizeIdentifier(identifier);
}
getAnimationEntryMetadata(entry: anmd.AnimationEntryMetadata): cpl.CompileAnimationEntryMetadata {
getAnimationEntryMetadata(entry: AnimationEntryMetadata): cpl.CompileAnimationEntryMetadata {
var defs = entry.definitions.map(def => this.getAnimationStateMetadata(def));
return new cpl.CompileAnimationEntryMetadata(entry.name, defs);
}
getAnimationStateMetadata(value: anmd.AnimationStateMetadata): cpl.CompileAnimationStateMetadata {
if (value instanceof anmd.AnimationStateDeclarationMetadata) {
getAnimationStateMetadata(value: AnimationStateMetadata): cpl.CompileAnimationStateMetadata {
if (value instanceof AnimationStateDeclarationMetadata) {
var styles = this.getAnimationStyleMetadata(value.styles);
return new cpl.CompileAnimationStateDeclarationMetadata(value.stateNameExpr, styles);
} else if (value instanceof anmd.AnimationStateTransitionMetadata) {
} else if (value instanceof AnimationStateTransitionMetadata) {
return new cpl.CompileAnimationStateTransitionMetadata(value.stateChangeExpr, this.getAnimationMetadata(value.animation));
}
return null;
}
getAnimationStyleMetadata(value: anmd.AnimationStyleMetadata): cpl.CompileAnimationStyleMetadata {
getAnimationStyleMetadata(value: AnimationStyleMetadata): cpl.CompileAnimationStyleMetadata {
return new cpl.CompileAnimationStyleMetadata(value.offset, value.styles);
}
getAnimationMetadata(value: anmd.AnimationMetadata): cpl.CompileAnimationMetadata {
if (value instanceof anmd.AnimationStyleMetadata) {
getAnimationMetadata(value: AnimationMetadata): cpl.CompileAnimationMetadata {
if (value instanceof AnimationStyleMetadata) {
return this.getAnimationStyleMetadata(value);
} else if (value instanceof anmd.AnimationKeyframesSequenceMetadata) {
} else if (value instanceof AnimationKeyframesSequenceMetadata) {
return new cpl.CompileAnimationKeyframesSequenceMetadata(value.steps.map(entry => this.getAnimationStyleMetadata(entry)));
} else if (value instanceof anmd.AnimationAnimateMetadata) {
} else if (value instanceof AnimationAnimateMetadata) {
let animateData = <cpl.CompileAnimationStyleMetadata|cpl.CompileAnimationKeyframesSequenceMetadata>this.getAnimationMetadata(value.styles);
return new cpl.CompileAnimationAnimateMetadata(value.timings, animateData);
} else if (value instanceof anmd.AnimationWithStepsMetadata) {
} else if (value instanceof AnimationWithStepsMetadata) {
var steps = value.steps.map(step => this.getAnimationMetadata(step));
if (value instanceof anmd.AnimationGroupMetadata) {
if (value instanceof AnimationGroupMetadata) {
return new cpl.CompileAnimationGroupMetadata(steps);
} else {
return new cpl.CompileAnimationSequenceMetadata(steps);

View File

@ -1,5 +1,4 @@
import {SecurityContext} from '../../core_private';
import {EMPTY_STATE as EMPTY_ANIMATION_STATE, LifecycleHooks, isDefaultChangeDetectionStrategy} from '../../core_private';
import {EMPTY_STATE as EMPTY_ANIMATION_STATE, LifecycleHooks, isDefaultChangeDetectionStrategy, SecurityContext} from '../../core_private';
import {isBlank, isPresent} from '../../src/facade/lang';