Conflicts:
	package.json
This commit is contained in:
Sebastian McKenzie
2014-11-23 11:30:14 +11:00
3 changed files with 132 additions and 68 deletions

View File

@@ -3306,80 +3306,141 @@ var fbTestFixture = {
},
'<div>{<div {...test} />}</div>': {
type: 'Program',
type: 'ExpressionStatement',
start: 0,
end: 30,
body: [{
type: 'ExpressionStatement',
expression: {
type: 'XJSElement',
start: 0,
end: 30,
expression: {
type: 'XJSElement',
openingElement: {
type: 'XJSOpeningElement',
start: 0,
end: 5,
attributes: [],
name: {
type: 'XJSIdentifier',
start: 1,
end: 4,
name: 'div'
},
selfClosing: false
},
closingElement: {
type: 'XJSClosingElement',
start: 24,
end: 30,
openingElement: {
type: 'XJSOpeningElement',
start: 0,
end: 5,
attributes: [],
name: {
type: 'XJSIdentifier',
start: 1,
end: 4,
name: 'div'
},
selfClosing: false
},
closingElement: {
type: 'XJSClosingElement',
start: 24,
end: 30,
name: {
type: 'XJSIdentifier',
start: 26,
end: 29,
name: 'div'
}
},
children: [{
type: 'XJSExpressionContainer',
start: 5,
end: 24,
expression: {
type: 'XJSElement',
name: {
type: 'XJSIdentifier',
start: 26,
end: 29,
name: 'div'
}
},
children: [{
type: 'XJSExpressionContainer',
start: 5,
end: 24,
expression: {
type: 'XJSElement',
start: 6,
end: 23,
openingElement: {
type: 'XJSOpeningElement',
start: 6,
end: 23,
openingElement: {
type: 'XJSOpeningElement',
start: 6,
end: 23,
attributes: [
{
type: 'XJSSpreadAttribute',
start: 11,
end: 20,
argument: {
type: 'Identifier',
start: 15,
end: 19,
name: 'test'
}
attributes: [
{
type: 'XJSSpreadAttribute',
start: 11,
end: 20,
argument: {
type: 'Identifier',
start: 15,
end: 19,
name: 'test'
}
],
name: {
type: 'XJSIdentifier',
start: 7,
end: 10,
name: 'div'
},
selfClosing: true
}
],
name: {
type: 'XJSIdentifier',
start: 7,
end: 10,
name: 'div'
},
closingElement: null,
children: []
}
}]
}
}]
selfClosing: true
},
closingElement: null,
children: []
}
}]
}
},
'<div>{ {a} }</div>': {
type: "ExpressionStatement",
start: 0,
end: 18,
expression: {
type: "XJSElement",
start: 0,
end: 18,
openingElement: {
type: "XJSOpeningElement",
start: 0,
end: 5,
attributes: [],
name: {
type: "XJSIdentifier",
start: 1,
end: 4,
name: "div"
},
selfClosing: false
},
closingElement: {
type: "XJSClosingElement",
start: 12,
end: 18,
name: {
type: "XJSIdentifier",
start: 14,
end: 17,
name: "div"
}
},
children: [{
type: "XJSExpressionContainer",
start: 5,
end: 12,
expression: {
type: "ObjectExpression",
start: 7,
end: 10,
properties: [{
type: "Property",
start: 8,
end: 9,
method: false,
shorthand: true,
computed: false,
key: {
type: "Identifier",
start: 8,
end: 9,
name: "a"
},
kind: "init",
value: {
type: "Identifier",
start: 8,
end: 9,
name: "a"
}
}]
}
}]
}
}
}
};