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

feat(compiler): make directive bindings optional. Fixes #647

This commit is contained in:
Jeremy Elbourn 2015-02-18 10:54:28 -08:00
parent 74c0699ad9
commit 785ec26322
3 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/angular2/src/core/compiler/pipeline/element_binder_builder.js vendored
View File

@ -204,22 +204,24 @@ export class ElementBinderBuilder extends CompileStep {
var attributeValue = MapWrapper.get(compileElement.attrs(), elProp);
if (isPresent(attributeValue)) {
expression = _this._parser.wrapLiteralPrimitive(attributeValue, _this._compilationUnit);
} else {
throw new BaseException("No element binding found for property '" + elProp
+ "' which is required by directive '" + stringify(directive.type) + "'");
}
}
var len = dirProp.length;
var dirBindingName = dirProp;
var isContentWatch = dirProp[len - 2] === '[' && dirProp[len - 1] === ']';
if (isContentWatch) dirBindingName = dirProp.substring(0, len - 2);
protoView.bindDirectiveProperty(
directiveIndex,
expression,
dirBindingName,
reflector.setter(dirBindingName),
isContentWatch
);
// Bindings are optional, so this binding only needs to be set up if an expression is given.
if (isPresent(expression)) {
var len = dirProp.length;
var dirBindingName = dirProp;
var isContentWatch = dirProp[len - 2] === '[' && dirProp[len - 1] === ']';
if (isContentWatch) dirBindingName = dirProp.substring(0, len - 2);
protoView.bindDirectiveProperty(
directiveIndex,
expression,
dirBindingName,
reflector.setter(dirBindingName),
isContentWatch
);
}
});
}
}

14
modules/angular2/test/core/compiler/integration_spec.js vendored
View File

@ -151,6 +151,20 @@ export function main() {
});
});
it('should support directives where a binding attribute is not given', function(done) {
tplResolver.setTemplate(MyComp,
new Template({
// No attribute "el-prop" specified.
inline: '<p my-dir></p>',
directives: [MyDir]
}));
compiler.compile(MyComp).then((pv) => {
createView(pv);
done();
});
});
it('should support template directives via `<template>` elements.', (done) => {
tplResolver.setTemplate(MyComp,
new Template({

14
modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js vendored
View File

@ -430,11 +430,15 @@ export function main() {
describe('errors', () => {
it('should throw if there is no element property bindings for a directive property binding', () => {
var pipeline = createPipeline({propertyBindings: MapWrapper.create(), directives: [SomeDecoratorDirectiveWithBinding]});
expect( () => {
pipeline.process(el('<div viewroot prop-binding directives>'));
}).toThrowError("No element binding found for property 'boundprop1' which is required by directive 'SomeDecoratorDirectiveWithBinding'");
it('should not throw any errors if there is no element property bindings for a directive ' +
'property binding', () => {
var pipeline = createPipeline({
propertyBindings: MapWrapper.create(),
directives: [SomeDecoratorDirectiveWithBinding]
});
// If processing throws an error, this test will fail.
pipeline.process(el('<div viewroot prop-binding directives>'));
});
});