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

feat(PropertyBindingParser): support onbubble-event as an alternate syntax for (^event)

Browse Source 
fixes #3448

Closes #3616
This commit is contained in:
Victor Berchet 2015-08-12 17:42:37 -07:00
parent 20cf61756a
commit 1f54e64fcf
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/angular2/src/render/dom/compiler/property_binding_parser.ts
View File

@ -12,13 +12,14 @@ import {dashCaseToCamelCase} from '../util';
// Group 1 = "bind-" // Group 1 = "bind-"
// Group 2 = "var-" or "#" // Group 2 = "var-" or "#"
// Group 3 = "on-" // Group 3 = "on-"
// Group 4 = "bindon-" // Group 4 = "onbubble-"
// Group 5 = the identifier after "bind-", "var-/#", or "on-" // Group 5 = "bindon-"
// Group 6 = idenitifer inside [()] // Group 6 = the identifier after "bind-", "var-/#", or "on-"
// Group 7 = idenitifer inside [] // Group 7 = idenitifer inside [()]
// Group 8 = identifier inside () // Group 8 = idenitifer inside []
// Group 9 = identifier inside ()
var BIND_NAME_REGEXP = var BIND_NAME_REGEXP =
/^(?:(?:(?:(bind-)|(var-|#)|(on-)|(bindon-))(.+))|\[\(([^\)]+)\)\]|\[([^\]]+)\]|\(([^\)]+)\))$/g; /^(?:(?:(?:(bind-)|(var-|#)|(on-)|(onbubble-)|(bindon-))(.+))|\[\(([^\)]+)\)\]|\[([^\]]+)\]|\(([^\)]+)\))$/g;
/** /**
* Parses the property bindings on a single element. * Parses the property bindings on a single element.
*/ */
@ -38,30 +39,33 @@ export class PropertyBindingParser implements CompileStep {
var bindParts = RegExpWrapper.firstMatch(BIND_NAME_REGEXP, attrName); var bindParts = RegExpWrapper.firstMatch(BIND_NAME_REGEXP, attrName);
if (isPresent(bindParts)) { if (isPresent(bindParts)) {
if (isPresent(bindParts[1])) { // match: bind-prop if (isPresent(bindParts[1])) { // match: bind-prop
this._bindProperty(bindParts[5], attrValue, current, newAttrs); this._bindProperty(bindParts[6], attrValue, current, newAttrs);
} else if (isPresent( } else if (isPresent(
bindParts[2])) { // match: var-name / var-name="iden" / #name / #name="iden" bindParts[2])) { // match: var-name / var-name="iden" / #name / #name="iden"
var identifier = bindParts[5]; var identifier = bindParts[6];
var value = attrValue == '' ? '\$implicit' : attrValue; var value = attrValue == '' ? '\$implicit' : attrValue;
this._bindVariable(identifier, value, current, newAttrs); this._bindVariable(identifier, value, current, newAttrs);
} else if (isPresent(bindParts[3])) { // match: on-event } else if (isPresent(bindParts[3])) { // match: on-event
this._bindEvent(bindParts[5], attrValue, current, newAttrs); this._bindEvent(bindParts[6], attrValue, current, newAttrs);
} else if (isPresent(bindParts[4])) { // match: bindon-prop } else if (isPresent(bindParts[4])) { // match: onbubble-event
this._bindProperty(bindParts[5], attrValue, current, newAttrs); this._bindEvent('^' + bindParts[6], attrValue, current, newAttrs);
this._bindAssignmentEvent(bindParts[5], attrValue, current, newAttrs);
} else if (isPresent(bindParts[6])) { // match: [(expr)] } else if (isPresent(bindParts[5])) { // match: bindon-prop
this._bindProperty(bindParts[6], attrValue, current, newAttrs); this._bindProperty(bindParts[6], attrValue, current, newAttrs);
this._bindAssignmentEvent(bindParts[6], attrValue, current, newAttrs); this._bindAssignmentEvent(bindParts[6], attrValue, current, newAttrs);
} else if (isPresent(bindParts[7])) { // match: [expr] } else if (isPresent(bindParts[7])) { // match: [(expr)]
this._bindProperty(bindParts[7], attrValue, current, newAttrs); this._bindProperty(bindParts[7], attrValue, current, newAttrs);
this._bindAssignmentEvent(bindParts[7], attrValue, current, newAttrs);
} else if (isPresent(bindParts[8])) { // match: (event) } else if (isPresent(bindParts[8])) { // match: [expr]
this._bindEvent(bindParts[8], attrValue, current, newAttrs); this._bindProperty(bindParts[8], attrValue, current, newAttrs);
} else if (isPresent(bindParts[9])) { // match: (event)
this._bindEvent(bindParts[9], attrValue, current, newAttrs);
} }
} else { } else {
var expr = this._parser.parseInterpolation(attrValue, current.elementDescription); var expr = this._parser.parseInterpolation(attrValue, current.elementDescription);

14
modules/angular2/test/render/dom/compiler/property_binding_parser_spec.ts
View File

@ -171,6 +171,20 @@ export function main() {
expect(eventBinding.fullName).toEqual('click'); expect(eventBinding.fullName).toEqual('click');
}); });
it('should detect onbubble- syntax', () => {
var results = process(el('<div onbubble-click="b()"></div>'));
var eventBinding = results[0].eventBindings[0];
expect(eventBinding.source.source).toEqual('b()');
expect(eventBinding.fullName).toEqual('^click');
});
it('should detect onbubble- syntax with data- prefix', () => {
var results = process(el('<div data-onbubble-click="b()"></div>'));
var eventBinding = results[0].eventBindings[0];
expect(eventBinding.source.source).toEqual('b()');
expect(eventBinding.fullName).toEqual('^click');
});
it('should parse event handlers using on- syntax as actions', () => { it('should parse event handlers using on- syntax as actions', () => {
var results = process(el('<div on-click="foo=bar"></div>')); var results = process(el('<div on-click="foo=bar"></div>'));
var eventBinding = results[0].eventBindings[0]; var eventBinding = results[0].eventBindings[0];