NextERP/owl
2
0
Fork 0
mirror of https://github.com/odoo/owl.git synced 2025-10-06 19:59:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

ref: qweb context cleanup

Browse Source 
Some code was uselessly duplicated.  We simplify in this commit the
handling of subcontexts.

closes #9
This commit is contained in:
Géry Debongnie
2019-03-22 15:01:22 +01:00
parent 597adb3981
commit 766d2f2301
1 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qweb.ts
+9 -33
View File
@@ -65,44 +65,18 @@ export class Context {
} }
withParent(node: number): Context { withParent(node: number): Context {
const newContext: Context = Object.create(this);
if (this === this.rootContext && this.parentNode) { if (this === this.rootContext && this.parentNode) {
throw new Error("A template should not have more than one root node"); throw new Error("A template should not have more than one root node");
} }
newContext.parentNode = node;
if (!this.rootContext.rootNode) { if (!this.rootContext.rootNode) {
this.rootContext.rootNode = node; this.rootContext.rootNode = node;
} }
return newContext; return this.subContext("parentNode", node);
} }
withVariables(variables: { [key: string]: any }) { subContext(key: keyof Context, value: any): Context {
const newContext = Object.create(this); const newContext = Object.create(this);
newContext.variables = Object.create(variables); newContext[key] = value;
return newContext;
}
withInLoop(): Context {
const newContext = Object.create(this);
newContext.inLoop = true;
return newContext;
}
withInPre(): Context {
const newContext = Object.create(this);
newContext.inPreTag = true;
return newContext;
}
withCaller(node: Element): Context {
const newContext = Object.create(this);
newContext.caller = node;
return newContext;
}
withEscaping(): Context {
const newContext = Object.create(this);
newContext.escaping = true;
return newContext; return newContext;
} }
@@ -485,7 +459,7 @@ export class QWeb {
} }
} }
if (node.nodeName === "pre") { if (node.nodeName === "pre") {
ctx = ctx.withInPre(); ctx = ctx.subContext("inPreTag", true);
} }
this._compileChildren(node, ctx); this._compileChildren(node, ctx);
@@ -724,7 +698,7 @@ const escDirective: Directive = {
ctx = ctx.withParent(nodeID); ctx = ctx.withParent(nodeID);
} }
let value = ctx.getValue(node.getAttribute("t-esc")!); let value = ctx.getValue(node.getAttribute("t-esc")!);
compileValueNode(value, node, qweb, ctx.withEscaping()); compileValueNode(value, node, qweb, ctx.subContext("escaping", true));
return true; return true;
} }
}; };
@@ -817,7 +791,9 @@ const callDirective: Directive = {
const tempCtx = new Context(); const tempCtx = new Context();
qweb._compileNode(nodeCopy, tempCtx); qweb._compileNode(nodeCopy, tempCtx);
const vars = Object.assign({}, ctx.variables, tempCtx.variables); const vars = Object.assign({}, ctx.variables, tempCtx.variables);
const subCtx = ctx.withCaller(nodeCopy).withVariables(vars); const subCtx = ctx
.subContext("caller", nodeCopy)
.subContext("variables", Object.create(vars));
qweb._compileNode(nodeTemplate, subCtx); qweb._compileNode(nodeTemplate, subCtx);
return true; return true;
@@ -829,7 +805,7 @@ const forEachDirective: Directive = {
priority: 10, priority: 10,
atNodeEncounter({ node, qweb, ctx }): boolean { atNodeEncounter({ node, qweb, ctx }): boolean {
ctx.rootContext.shouldProtectContext = true; ctx.rootContext.shouldProtectContext = true;
ctx = ctx.withInLoop(); ctx = ctx.subContext("inLoop", true);
const elems = node.getAttribute("t-foreach")!; const elems = node.getAttribute("t-foreach")!;
const name = node.getAttribute("t-as")!; const name = node.getAttribute("t-as")!;
let arrayID = ctx.generateID(); let arrayID = ctx.generateID();