Skip to content

feat(ViewSplitter): Change template shorthand syntax from '!' to '*' #727

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.

Sign up for GitHub

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

Closed
vicb wants to merge 1 commit into from
Closed

feat(ViewSplitter): Change template shorthand syntax from '!' to '*' #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions modules/angular2/src/core/compiler/pipeline/view_splitter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import {CompileElement} from './compile_element';
import {CompileControl} from './compile_control';
import {StringWrapper} from 'angular2/src/facade/lang';

import {$BANG} from 'angular2/src/change_detection/parser/lexer';

/**
* Splits views at `<template>` elements or elements with `template` attribute:
* For `<template>` elements:
Expand Down Expand Up @@ -59,9 +57,9 @@ export class ViewSplitter extends CompileStep {
var templateBindings = MapWrapper.get(attrs, 'template');
var hasTemplateBinding = isPresent(templateBindings);

// look for template shortcuts such as !if="condition" and treat them as template="if condition"
// look for template shortcuts such as *if="condition" and treat them as template="if condition"
MapWrapper.forEach(attrs, (attrValue, attrName) => {
if (StringWrapper.charCodeAt(attrName, 0) == $BANG) {
if (StringWrapper.startsWith(attrName, '*')) {
var key = StringWrapper.substring(attrName, 1); // remove the bang
if (hasTemplateBinding) {
// 2nd template binding detected
Expand Down
22 changes: 11 additions & 11 deletions modules/angular2/test/core/compiler/pipeline/view_splitter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,26 +99,26 @@ export function main() {

});

describe('elements with !directive_name attribute', () => {
describe('elements with *directive_name attribute', () => {

it('should replace the element with an empty <template> element', () => {
var rootElement = el('<div><span !if></span></div>');
var rootElement = el('<div><span *if></span></div>');
var originalChild = rootElement.childNodes[0];
var results = createPipeline().process(rootElement);
expect(results[0].element).toBe(rootElement);
expect(DOM.getOuterHTML(results[0].element)).toEqual('<div><template if=""></template></div>');
expect(DOM.getOuterHTML(results[2].element)).toEqual('<span !if=""></span>')
expect(DOM.getOuterHTML(results[2].element)).toEqual('<span *if=""></span>')
expect(results[2].element).toBe(originalChild);
});

it('should mark the element as viewRoot', () => {
var rootElement = el('<div><div !foo="bar"></div></div>');
var rootElement = el('<div><div *foo="bar"></div></div>');
var results = createPipeline().process(rootElement);
expect(results[2].isViewRoot).toBe(true);
});

it('should work with top-level template node', () => {
var rootElement = DOM.createTemplate('<div !foo>x</div>');
var rootElement = DOM.createTemplate('<div *foo>x</div>');
var originalChild = rootElement.content.childNodes[0];
var results = createPipeline().process(rootElement);

Expand All @@ -130,42 +130,42 @@ export function main() {
});

it('should add property bindings from the template attribute', () => {
var rootElement = el('<div><div !prop="expr"></div></div>');
var rootElement = el('<div><div *prop="expr"></div></div>');
var results = createPipeline().process(rootElement);
expect(MapWrapper.get(results[1].propertyBindings, 'prop').source).toEqual('expr');
});

it('should add variable mappings from the template attribute', () => {
var rootElement = el('<div><div !foreach="var varName=mapName"></div></div>');
var rootElement = el('<div><div *foreach="var varName=mapName"></div></div>');
var results = createPipeline().process(rootElement);
expect(results[1].variableBindings).toEqual(MapWrapper.createFromStringMap({'mapName': 'varName'}));
});

it('should add entries without value as attribute to the element', () => {
var rootElement = el('<div><div !varname></div></div>');
var rootElement = el('<div><div *varname></div></div>');
var results = createPipeline().process(rootElement);
expect(results[1].attrs()).toEqual(MapWrapper.createFromStringMap({'varname': ''}));
expect(results[1].propertyBindings).toBe(null);
expect(results[1].variableBindings).toBe(null);
});

it('should iterate properly after a template dom modification', () => {
var rootElement = el('<div><div !foo></div><after></after></div>');
var rootElement = el('<div><div *foo></div><after></after></div>');
var results = createPipeline().process(rootElement);
// 1 root + 2 initial + 1 generated template elements
expect(results.length).toEqual(4);
});

it('should not allow multiple template directives on the same element', () => {
expect( () => {
var rootElement = el('<div><div !foo !bar="blah"></div></div>');
var rootElement = el('<div><div *foo *bar="blah"></div></div>');
createPipeline().process(rootElement);
}).toThrowError('Only one template directive per element is allowed: foo and bar cannot be used simultaneously!');
});

it('should not allow template and bang directives on the same element', () => {
expect( () => {
var rootElement = el('<div><div !foo template="blah"></div></div>');
var rootElement = el('<div><div *foo template="blah"></div></div>');
createPipeline().process(rootElement);
}).toThrowError('Only one template directive per element is allowed: blah and foo cannot be used simultaneously!');
});
Expand Down