github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

spacebars WIP

Browse Source
This commit is contained in:
David Greenspan
2013-07-16 10:22:36 -07:00
parent ccde6a051f
commit a116be3f83
2 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/unfinished/shark/client/shark.js
View File

@@ -55,7 +55,7 @@ Template.item({
// console.log(TABLE.rows.length);
//});
Span = UIComponent.extend({
Span = UI.Component.extend({
typeName: 'Span',
render: function (buf) {
buf("<span ",
@@ -76,7 +76,7 @@ Span = UIComponent.extend({
}
});
Div = UIComponent.extend({
Div = UI.Component.extend({
typeName: 'Div',
render: function (buf) {
buf("<div style='background:cyan;margin:5px'>World",
@@ -89,7 +89,7 @@ Div = UIComponent.extend({
}
});
Either = UIComponent.extend({
Either = UI.Component.extend({
typeName: 'Either',
render: function (buf) {
buf(Div.create(),
@@ -106,23 +106,23 @@ Either = UIComponent.extend({
}
}
},
new _UI.If({
new UI.If({
data: function () { return Session.get('which') === 'Div'; },
content: Div,
elseContent: Span
}),
{ type: Span });
buf(new _UI.Each({
buf(new UI.Each({
data: function () {
var sess = Session.get('items');
return sess != null ? sess :
Items.find({}, { sort: { text: 1 }});
},
content: UIComponent.extend({
content: UI.Component.extend({
render: function (buf) {
var self = this;
buf("<div>Each ",
_UI.Text(function () { return self.data().text; }),
UI.Text(function () { return self.data().text; }),
" ", String(Math.random()),
"</div>");
}
@@ -139,17 +139,17 @@ Meteor.startup(function () {
x.attach(document.body);
// leak `c`
(c = _UI.Counter.create({isRoot:true})).attach(document.body);
(c = UI.Counter.create({isRoot:true})).attach(document.body);
});
Meteor.startup(function () {
var c = UIComponent.extend({
var c = UI.Component.extend({
render: function(buf) {
buf(String(this.data()));
}
});
L = _UI.List({elseContent: function () {
L = UI.List({elseContent: function () {
return c(function () { return 'else'; });
}});

65
packages/spacebars/spacebars.js
View File

@@ -618,11 +618,14 @@ Spacebars.compile = function (inputString, options) {
// returns: array of source strings, or null if no
// args at all.
//
// if forComponentWithOpts is truthy, perform
// component invocation argument handling.
// forComponentWithOpts is a map from name of keyword
// argument to source code. For example,
// `{ content: "Component.extend(..." }`.
// In this case, we return an array of exactly one string
// containing the source code of an object literal.
var codeGenArgs = function (tagArgs, funcInfo,
forComponentWithOpts) {
var options = null; // source -> source
@@ -643,8 +646,8 @@ Spacebars.compile = function (inputString, options) {
argCode = toJSLiteral(argValue);
break;
case 'PATH':
argCode = 'Spacebars.call(' +
codeGenPath(argValue, funcInfo) + ')';
argCode = 'function () { return Spacebars.call(' +
codeGenPath(argValue, funcInfo) + '); }';
break;
default:
error("Unexpected arg type: " + argType);
@@ -692,6 +695,23 @@ Spacebars.compile = function (inputString, options) {
return args;
};
var codeGenComponent = function (path, args, funcInfo,
compOptions) {
var nameCode = codeGenPath(path, funcInfo, true);
var argCode = codeGenArgs(args, funcInfo,
compOptions || {})[0];
// XXX provide a better error message if
// `foo` in `{{> foo}}` is not found?
// Instead of `null`, we could evaluate to the path
// as a string, and then the renderer could choke on
// that in a way where it ends up in the error message.
return '{type: function () { return ((' + nameCode +
') || null); }, args: ' + argCode + '}';
};
var codeGenBasicStache = function (tag, funcInfo) {
var nameCode = codeGenPath(tag.path, funcInfo);
var argCode = codeGenArgs(tag.args, funcInfo);
@@ -752,58 +772,53 @@ Spacebars.compile = function (inputString, options) {
usedSelf: false // read/write
};
var bodyLines = [];
var renderables = [];
_.each(tokens, function (t) {
switch (t.type) {
case 'Characters':
if (typeof t.data === 'string') {
bodyLines.push('buf.text(' + toJSLiteral(t.data) +
');');
renderables.push(toJSLiteral(t.data));
} else {
_.each(t.data, function (tagOrStr) {
if (typeof tagOrStr === 'string') {
bodyLines.push('buf.text(' + toJSLiteral(tagOrStr) +
');');
renderables.push(toJSLiteral(tagOrStr));
} else {
// tag or block
var tag = tagOrStr;
if (tag.isBlock) {
// XXX as an optimization, move these inner
// Component classes out so they become
// members of the enclosing class, so they
// aren't created per call to render.
var block = tag;
var nameCode = codeGenPath(
block.openTag.path, funcInfo, true);
var extraArgs = {
content: 'Component.extend({render: ' +
content: 'UI.Component.extend({render: ' +
tokensToRenderFunc(block.bodyTokens, indent) +
'})'
};
if (block.elseTokens) {
extraArgs.elseContent =
'Component.extend({render: ' +
'UI.Component.extend({render: ' +
tokensToRenderFunc(block.elseTokens, indent) +
'})';
}
var argCode =
codeGenArgs(block.openTag.args, funcInfo,
extraArgs)[0];
bodyLines.push('buf.component(function () { return ((' + nameCode + ') || Component).create(' + argCode +
'); });');
renderables.push(codeGenComponent(
block.openTag.path,
block.openTag.args,
funcInfo, extraArgs));
} else {
switch (tag.type) {
case 'INCLUSION':
var nameCode = codeGenPath(tag.path, funcInfo, true);
var argCode =
codeGenArgs(tag.args, funcInfo, {})[0];
bodyLines.push('buf.component(function () { return ((' + nameCode + ') || Component).create(' + argCode +
'); });');
renderables.push(codeGenComponent(
tag.path, tag.args, funcInfo));
break;
case 'DOUBLE':
case 'TRIPLE':
bodyLines.push(
'buf.' +
(tag.type === 'TRIPLE' ? 'rawHtml' : 'text') +
renderables.push(
'UI.' + (tag.type === 'TRIPLE' ? 'HTML' : 'Text') +
'(function () { return ' +
codeGenBasicStache(tag, funcInfo) +
'; });');
'; })');
break;
case 'COMMENT':
break;