honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(transformer): Fix annotation_matcher for NgForm directive.

Browse Source 
The NgForm directive imports Directive from a previously unlisted import.
This commit is contained in:
Jacob MacDonald 2015-06-25 13:10:45 -07:00
parent b50edfd1f3
commit 9c768501c4
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/angular2/src/transform/common/annotation_matcher.dart
View File

@ -24,6 +24,8 @@ const INJECTABLES = const [
const DIRECTIVES = const [ const DIRECTIVES = const [
const AnnotationDescriptor('Directive', const AnnotationDescriptor('Directive',
'package:angular2/src/core/annotations/annotations.dart', 'Injectable'), 'package:angular2/src/core/annotations/annotations.dart', 'Injectable'),
const AnnotationDescriptor('Directive',
'package:angular2/src/core/annotations/decorators.dart', 'Injectable'),
const AnnotationDescriptor('Directive', const AnnotationDescriptor('Directive',
'package:angular2/src/core/annotations_impl/annotations.dart', 'package:angular2/src/core/annotations_impl/annotations.dart',
'Injectable'), 'Injectable'),
@ -38,6 +40,8 @@ const DIRECTIVES = const [
const COMPONENTS = const [ const COMPONENTS = const [
const AnnotationDescriptor('Component', const AnnotationDescriptor('Component',
'package:angular2/src/core/annotations/annotations.dart', 'Directive'), 'package:angular2/src/core/annotations/annotations.dart', 'Directive'),
const AnnotationDescriptor('Component',
'package:angular2/src/core/annotations/decorators.dart', 'Directive'),
const AnnotationDescriptor('Component', const AnnotationDescriptor('Component',
'package:angular2/src/core/annotations_impl/annotations.dart', 'package:angular2/src/core/annotations_impl/annotations.dart',
'Directive'), 'Directive'),

3
modules/angular2/src/transform/template_compiler/change_detector_codegen.dart
View File

@ -222,8 +222,7 @@ class _CodegenState {
List<String> _getNonNullPipeNames() { List<String> _getNonNullPipeNames() {
return _records return _records
.where((r) => .where((r) => r.mode == RecordType.PIPE)
r.mode == RecordType.PIPE)
.map((r) => _pipeNames[r.selfIndex]) .map((r) => _pipeNames[r.selfIndex])
.toList(); .toList();
} }

4
modules/angular2/src/transform/template_compiler/generator.dart
View File

@ -85,7 +85,6 @@ class _TemplateExtractor {
_TemplateExtractor(XHR xhr) _TemplateExtractor(XHR xhr)
: _factory = new CompileStepFactory(new ng.Parser(new ng.Lexer())) { : _factory = new CompileStepFactory(new ng.Parser(new ng.Lexer())) {
var urlResolver = new UrlResolver(); var urlResolver = new UrlResolver();
var styleUrlResolver = new StyleUrlResolver(urlResolver); var styleUrlResolver = new StyleUrlResolver(urlResolver);
var styleInliner = new StyleInliner(xhr, styleUrlResolver, urlResolver); var styleInliner = new StyleInliner(xhr, styleUrlResolver, urlResolver);
@ -110,8 +109,7 @@ class _TemplateExtractor {
var compileElements = var compileElements =
pipeline.process(templateEl, ViewType.COMPONENT, viewDef.componentId); pipeline.process(templateEl, ViewType.COMPONENT, viewDef.componentId);
var protoViewDto = compileElements[0].inheritedProtoView var protoViewDto = compileElements[0].inheritedProtoView.build();
.build();
reflector.reflectionCapabilities = savedReflectionCapabilities; reflector.reflectionCapabilities = savedReflectionCapabilities;

4
modules/angular2/test/transform/directive_processor/all_tests.dart
View File

@ -49,8 +49,8 @@ void allTests() {
readFile( readFile(
'directive_processor/absolute_url_expression_files/template.css')); 'directive_processor/absolute_url_expression_files/template.css'));
_testNgDeps('should inline `templateUrl` and `styleUrls` values expressed as' _testNgDeps('should inline `templateUrl` and `styleUrls` values expressed as'
' absolute urls.', ' absolute urls.', 'absolute_url_expression_files/hello.dart',
'absolute_url_expression_files/hello.dart', reader: absoluteReader); reader: absoluteReader);
_testNgDeps( _testNgDeps(
'should inline multiple `styleUrls` values expressed as absolute urls.', 'should inline multiple `styleUrls` values expressed as absolute urls.',