archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #198 - Marko v3: Replace <div attrs(myAttrs)> with <div ${myAttrs}>

Browse Source
This commit is contained in:
Patrick Steele-Idem 2016-02-01 16:31:12 -07:00
parent f47bfe9da3
commit 9dbb77870f
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/CompileContext.js
View File

@ -213,6 +213,10 @@ class CompileContext {
// Validate the attributes
attributes.forEach((attr) => {
let attrName = attr.name;
if (!attrName) {
// Attribute will be name for placeholder attributes. For example: <div ${data.myAttrs}>
return;
}
let attrDef = taglibLookup.getAttribute(tagName, attrName);
if (!attrDef) {
if (tagDef) {

4
compiler/ast/HtmlAttribute.js
View File

@ -149,6 +149,10 @@ class HtmlAttribute extends Node {
let value = this.value;
let argument = this.argument;
if (!name) {
return;
}
if (this.isLiteralValue()) {
var literalValue = value.value;
if (typeof literalValue === 'boolean' || literalValue === '') {

5
compiler/ast/HtmlAttributeCollection.js
View File

@ -31,7 +31,10 @@ class HtmlAttributeCollection {
}
}
this.lookup[name.toLowerCase()] = newAttr;
if (name) {
this.lookup[name.toLowerCase()] = newAttr;
}
this.all.push(newAttr);
}

17
taglibs/core/core-transformer.js
View File

@ -69,15 +69,6 @@ var coreAttrHandlers = [
el.setBodyOnlyIf(condition);
}
],
[
'attrs', function(attr, node) {
if (!node.addDynamicAttributes) {
node.addError('Node does not support the "attrs" attribute');
} else {
node.addDynamicAttributes(attr.value);
}
}
],
[
'marko-preserve-whitespace', function(attr, node) {
node.setPreserveWhitespace(true);
@ -116,6 +107,14 @@ module.exports = function transform(el, context) {
el.forEachAttribute((attr) => {
let attrName = attr.name;
if (!attrName) {
if (!node.addDynamicAttributes) {
node.addError('Node does not support the "attrs" attribute');
} else {
node.addDynamicAttributes(attr.value);
}
return;
}
var attrTransformerFunc = attributeTransformers[attrName];
if (attrTransformerFunc) {
if (!attributeTransfomer) {

2
test/fixtures/render/autotest/attrs/template.marko vendored
View File

@ -1,3 +1,3 @@
<div attrs=data.myAttrs data-encoding='"hello"'>
<div ${data.myAttrs} data-encoding='"hello"'>
Hello World!
</div>