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

prevent issue when widget is toggled

Browse Source
This commit is contained in:
Géry Debongnie
2019-01-28 15:51:20 +01:00
parent 851d01b7ad
commit ee255993a8
4 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/static/src/ts/core/Widget.ts
+1
View File
@@ -26,6 +26,7 @@ interface Meta<T extends WEnv> {
parent: Widget<T> | null;
children: { [key: number]: Widget<T> };
// children mapping: from templateID to widgetID
// should it be a map number => Widget?
cmap: { [key: number]: number };
}
web/static/src/ts/core/qweb_vdom.ts
+7 -7
View File
@@ -715,16 +715,16 @@ const widgetDirective: Directive = {
ctx.addLine(`let _${dummyID}_index = c${ctx.parentNode}.length;`);
ctx.addLine(`c${ctx.parentNode}.push(_${dummyID});`);
ctx.addLine(`let def${defID};`);
ctx.addLine(
`let w${widgetID} = ${widgetID} in context.__widget__.cmap ? context.__widget__.children[context.__widget__.cmap[${widgetID}]] : false;`
);
ctx.addLine(`if (${widgetID} in context.__widget__.cmap) {`);
ctx.addLine(`if (w${widgetID}) {`);
ctx.indent();
ctx.addLine(
`let curWidget = context.__widget__.children[context.__widget__.cmap[${widgetID}]]`
);
ctx.addLine(
`def${defID} = curWidget.updateProps(${props}).then(()=>{vnode=curWidget.__widget__.vnode;c${
`def${defID} = w${widgetID}.updateProps(${props}).then(()=>{vnode=w${widgetID}.__widget__.vnode;c${
ctx.parentNode
}[_${dummyID}_index]=vnode;vnode.data.hook = {remove(){curWidget.destroy()}}});`
}[_${dummyID}_index]=vnode;vnode.data.hook = {remove(){w${widgetID}.destroy()}}});`
);
ctx.dedent();
ctx.addLine("} else {");
@@ -734,7 +734,7 @@ const widgetDirective: Directive = {
`let _${widgetID} = new context.widgets['${value}'](owner, ${props});`
);
ctx.addLine(
`context.__widget__.cmap[${widgetID}] = _${widgetID}.__widget__.id`
`context.__widget__.cmap[${widgetID}] = _${widgetID}.__widget__.id;`
);
ctx.addLine(
`def${defID} = _${widgetID}._start().then(() => _${widgetID}._render()).then(vnode=>{c${