Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(core): desugar [()] to [prop] and (prop-change) #4658

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/angular2/src/core/compiler/template_parser.ts
Expand Up @@ -361,7 +361,8 @@ class TemplateParseVisitor implements HtmlAstVisitor {

private _parseAssignmentEvent(name: string, expression: string, sourceInfo: string,
targetMatchableAttrs: string[][], targetEvents: BoundEventAst[]) {
this._parseEvent(name, `${expression}=$event`, sourceInfo, targetMatchableAttrs, targetEvents);
this._parseEvent(`${name}-change`, `${expression}=$event`, sourceInfo, targetMatchableAttrs,
targetEvents);
}

private _parseEvent(name: string, expression: string, sourceInfo: string,
Expand Down
Expand Up @@ -75,7 +75,7 @@ const controlNameBinding =
selector: '[ng-control]',
bindings: [controlNameBinding],
inputs: ['name: ngControl', 'model: ngModel'],
outputs: ['update: ngModel'],
outputs: ['update: ngModelChange'],
exportAs: 'form'
})
export class NgControlName extends NgControl implements OnChanges,
Expand Down
Expand Up @@ -66,7 +66,7 @@ const formControlBinding =
selector: '[ng-form-control]',
bindings: [formControlBinding],
inputs: ['form: ngFormControl', 'model: ngModel'],
outputs: ['update: ngModel'],
outputs: ['update: ngModelChange'],
exportAs: 'form'
})
export class NgFormControl extends NgControl implements OnChanges {
Expand Down
2 changes: 1 addition & 1 deletion modules/angular2/src/core/forms/directives/ng_model.ts
Expand Up @@ -37,7 +37,7 @@ const formControlBinding = CONST_EXPR(new Binding(NgControl, {toAlias: forwardRe
selector: '[ng-model]:not([ng-control]):not([ng-form-control])',
bindings: [formControlBinding],
inputs: ['model: ngModel'],
outputs: ['update: ngModel'],
outputs: ['update: ngModelChange'],
exportAs: 'form'
})
export class NgModel extends NgControl implements OnChanges {
Expand Down
4 changes: 2 additions & 2 deletions modules/angular2/test/core/compiler/template_parser_spec.ts
Expand Up @@ -282,7 +282,7 @@ export function main() {
],
[
BoundEventAst,
'prop',
'propChange',
null,
'v = $event',
'TestComp > div:nth-child(0)[[(prop)]=v]'
Expand All @@ -305,7 +305,7 @@ export function main() {
],
[
BoundEventAst,
'prop',
'propChange',
null,
'v = $event',
'TestComp > div:nth-child(0)[bindon-prop=v]'
Expand Down
14 changes: 6 additions & 8 deletions modules/angular2/test/core/linker/integration_spec.ts
Expand Up @@ -839,9 +839,9 @@ export function main() {
rootTC.debugElement.componentInstance.ctxProp = 'one';
rootTC.detectChanges();

expect(dir.value).toEqual('one');
expect(dir.control).toEqual('one');

ObservableWrapper.subscribe(dir.control, (_) => {
ObservableWrapper.subscribe(dir.controlChange, (_) => {
expect(rootTC.debugElement.componentInstance.ctxProp).toEqual('two');
async.done();
});
Expand Down Expand Up @@ -2072,15 +2072,13 @@ class ToolbarComponent {
}
}

@Directive({selector: '[two-way]', inputs: ['value: control'], outputs: ['control']})
@Directive({selector: '[two-way]', inputs: ['control'], outputs: ['controlChange']})
@Injectable()
class DirectiveWithTwoWayBinding {
control: EventEmitter;
value: any;
controlChange = new EventEmitter();
control = null;

constructor() { this.control = new EventEmitter(); }

triggerChange(value) { ObservableWrapper.callNext(this.control, value); }
triggerChange(value) { ObservableWrapper.callNext(this.controlChange, value); }
}

@Injectable()
Expand Down
3 changes: 2 additions & 1 deletion modules/upgrade/src/ng1_facade.ts
Expand Up @@ -63,14 +63,15 @@ export class ExportedNg1Component {
localName = localName.substr(1) || name;
var outputName = 'output_' + name;
var outputNameRename = outputName + ': ' + name;
var outputNameRenameChange = outputName + ': ' + name + 'Change';
var inputName = 'input_' + name;
var inputNameRename = inputName + ': ' + name;
switch (type) {
case '=':
this.propertyOutputs.push(outputName);
this.checkProperties.push(localName);
this.outputs.push(outputName);
this.outputsRename.push(outputNameRename);
this.outputsRename.push(outputNameRenameChange);
this.propertyMap[outputName] = localName;
// don't break; let it fall through to '@'
case '@':
Expand Down
16 changes: 12 additions & 4 deletions modules/upgrade/src/ng2_facade.ts
Expand Up @@ -120,15 +120,23 @@ export class Ng2ComponentFacade {
var output = outputs[j];
var expr = null;
var assignExpr = false;

var bindonAttr =
output.bindonAttr ? output.bindonAttr.substring(0, output.bindonAttr.length - 6) : null;
var bracketParenAttr =
output.bracketParenAttr ?
`[(${output.bracketParenAttr.substring(2, output.bracketParenAttr.length - 8)})]` :
null;

if (attrs.hasOwnProperty(output.onAttr)) {
expr = attrs[output.onAttr];
} else if (attrs.hasOwnProperty(output.parenAttr)) {
expr = attrs[output.parenAttr];
} else if (attrs.hasOwnProperty(output.bindonAttr)) {
expr = attrs[output.bindonAttr];
} else if (attrs.hasOwnProperty(bindonAttr)) {
expr = attrs[bindonAttr];
assignExpr = true;
} else if (attrs.hasOwnProperty(output.bracketParenAttr)) {
expr = attrs[output.bracketParenAttr];
} else if (attrs.hasOwnProperty(bracketParenAttr)) {
expr = attrs[bracketParenAttr];
assignExpr = true;
}

Expand Down
8 changes: 6 additions & 2 deletions modules/upgrade/test/integration_spec.ts
Expand Up @@ -111,8 +111,12 @@ export function main() {
Component({
selector: 'ng2',
inputs: ['literal', 'interpolate', 'oneWayA', 'oneWayB', 'twoWayA', 'twoWayB'],
outputs:
['eventA', 'eventB', 'twoWayAEmitter: twoWayA', 'twoWayBEmitter: twoWayB']
outputs: [
'eventA',
'eventB',
'twoWayAEmitter: twoWayAChange',
'twoWayBEmitter: twoWayBChange'
]
})
.View({
template:
Expand Down