add on-directive

This commit is contained in:
Géry Debongnie
2019-01-20 09:10:50 +01:00
parent 3a4d1ef1ba
commit cc96328bdd
2 changed files with 61 additions and 3 deletions
+24 -2
View File
@@ -95,7 +95,8 @@ export default class QWeb {
elseDirective,
elifDirective,
ifDirective,
callDirective
callDirective,
onDirective
].forEach(d => this.addDirective(d));
}
@@ -170,6 +171,9 @@ export default class QWeb {
* @param {string} name the template should already have been added
*/
render(name: string, context: any = {}): VNode {
if (!(name in this.rawTemplates)) {
throw new Error(`Template ${name} does not exist`);
}
const template = this.templates[name] || this._compile(name);
return template(context);
}
@@ -617,4 +621,22 @@ const forEachDirective: Directive = {
ctx.addLine("}");
return true;
}
};
};
const onDirective: Directive = {
name: "on",
priority: 90,
atNodeCreation({ ctx, fullName, value, nodeID }) {
const eventName = fullName.slice(5);
let extraArgs;
let handler = value.replace(/\(.*\)/, function(args) {
extraArgs = args.slice(1, -1);
return "";
});
ctx.addLine(
`p${nodeID}.on = {${eventName}: context['${handler}'].bind(context${
extraArgs ? ", " + extraArgs : ""
})}`
);
}
};
+37 -1
View File
@@ -5,10 +5,14 @@ import sdListeners from "../src/libs/snabbdom/src/modules/eventlisteners";
const patch = init([sdAttributes, sdListeners]);
function qwebRender(qweb: QWeb, t: string, context: EvalContext = {}): string {
function renderToDOM(qweb: QWeb, t: string, context: EvalContext = {}): HTMLElement {
const vnode = qweb.render(t, context);
const node = document.createElement(vnode.sel!);
patch(node, vnode);
return node;
}
function qwebRender(qweb: QWeb, t: string, context: EvalContext = {}): string {
const node = renderToDOM(qweb, t, context);
return node.outerHTML;
}
@@ -54,6 +58,13 @@ describe("error handling", () => {
"A template should have one root node"
);
});
test("nice warning if no template with given name", () => {
const qweb = new QWeb();
expect(() => qweb.render('invalidname')).toThrow('does not exist');
});
});
describe("t-esc", () => {
@@ -518,3 +529,28 @@ describe("misc", () => {
expect(qwebRender(qweb, "caller").trim()).toBe(expected);
});
});
describe("t-on", () => {
test("can bind event handler", () => {
const qweb = new QWeb();
qweb.addTemplate('test', `<button t-on-click="add">Click</button>`);
let a = 1;
const node = renderToDOM(qweb, 'test', {
add() { a = 3}
});
node.click();
expect(a).toBe(3);
});
test("can bind handlers with arguments", () => {
const qweb = new QWeb();
qweb.addTemplate('test', `<button t-on-click="add(5)">Click</button>`);
let a = 1;
const node = renderToDOM(qweb, 'test', {
add(n) { a = a + n}
});
node.click();
expect(a).toBe(6);
});
});