vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/next' into propSafeRequest

Browse source
This commit is contained in:
Barney 2014-11-10 15:36:12 +00:00
commit b7935f8afd
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
docs/layout/tools/template-compiler.sjs
View file

@ -6,7 +6,7 @@ Installation: npm install -g sweet.js
Usage: sjs --module /template-compiler.sjs --output <output-filename>.js <input-filename>.js Usage: sjs --module /template-compiler.sjs --output <output-filename>.js <input-filename>.js
*/ */
macro m { macro m_impl {
case { _ ($selector, $dynAttrs ..., $children ...) } => { case { _ ($selector, $dynAttrs ..., $children ...) } => {
var selectorSyntax = #{$selector}; var selectorSyntax = #{$selector};
var selector = unwrapSyntax(selectorSyntax); var selector = unwrapSyntax(selectorSyntax);
@ -47,7 +47,7 @@ macro m {
return #{ ({tag: $tag, attrs: $attrs , children: $children ...}) }; return #{ ({tag: $tag, attrs: $attrs , children: $children ...}) };
} }
catch (e) { catch (e) {
return #{ m($tag, {}, [$dynAttrs ..., $children ...]) } return #{ m_impl($tag, {}, [$dynAttrs ..., $children ...]) }
} }
} }
case { _ ($selector, $partial ...) } => { case { _ ($selector, $partial ...) } => {
@ -55,17 +55,29 @@ macro m {
try { try {
var partial = unwrapSyntax(partialSyntax); var partial = unwrapSyntax(partialSyntax);
var isTag = partial.inner && partial.inner.length > 2 && (partial.inner[0].token.value == "tag" && partial.inner[1].token.value == ":") var isTag = partial.inner && partial.inner.length > 2 && (partial.inner[0].token.value == "tag" && partial.inner[1].token.value == ":")
return !isTag ? #{m($selector, $partial ..., [])} : #{m($selector, {}, $partial ...)}; return !isTag ? #{m_impl($selector, $partial ..., [])} : #{m_impl($selector, {}, $partial ...)};
} }
catch (e) { catch (e) {
return #{m($selector, {}, $partial ...)} return #{m_impl($selector, {}, $partial ...)}
} }
} }
case { _ ($selector) } => { case { _ ($selector) } => {
return #{m($selector, {}, [])}; return #{m_impl($selector, {}, [])};
}
}
let m = macro {
case { _ ($selector, $dynAttrs ..., $children ...) } => {
return #{m_impl($selector, $dynAttrs ..., $children ...)}
}
case { _ ($selector, $partial ...) } => {
return #{m_impl($selector, $partial ...)}
}
case { _ ($selector) } => {
return #{m_impl($selector, {}, [])};
} }
case { _ } => { case { _ } => {
return #{Mithril}; return #{m};
} }
} }