fix: allow t-attf- attributes to combine with regular attrs

fixes #10
This commit is contained in:
Géry Debongnie
2019-04-02 09:22:37 +02:00
parent 990a08dc04
commit 56be87f26e
3 changed files with 29 additions and 2 deletions
+12 -2
View File
@@ -522,7 +522,10 @@ export class QWeb {
const value = attributes[i].textContent!;
// regular attributes
if (!name.startsWith("t-")) {
if (
!name.startsWith("t-") &&
!(<Element>node).getAttribute("t-attf-" + name)
) {
const attID = ctx.generateID();
ctx.addLine(`let _${attID} = '${value}';`);
if (!name.match(/^[a-zA-Z]+$/)) {
@@ -576,7 +579,14 @@ export class QWeb {
s => "${" + ctx.formatExpression(s.slice(2, -2)) + "}"
);
const attID = ctx.generateID();
ctx.addLine(`let _${attID} = \`${formattedExpr}\`;`);
let staticVal = (<Element>node).getAttribute(attName);
if (staticVal) {
ctx.addLine(
`let _${attID} = '${staticVal} ' + \`${formattedExpr}\`;`
);
} else {
ctx.addLine(`let _${attID} = \`${formattedExpr}\`;`);
}
attrs.push(`${attName}: _${attID}`);
}