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

protect against widget destruction before being started

Browse Source
This commit is contained in:
Géry Debongnie
2019-02-08 09:17:04 +01:00
parent fa13bbb919
commit 971b798803
3 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/static/src/ts/core/component.ts
+2 -1
View File
@@ -1,3 +1,4 @@
import h from "../../../libs/snabbdom/src/h";
import sdAttrs from "../../../libs/snabbdom/src/modules/attributes";
import sdListeners from "../../../libs/snabbdom/src/modules/eventlisteners";
import { init } from "../../../libs/snabbdom/src/snabbdom";
@@ -231,7 +232,7 @@ export class Component<
this.__widget__.renderProps = this.props;
this.__widget__.renderPromise = this.willStart().then(() => {
if (this.__widget__.isDestroyed) {
return Promise.resolve(this.env.qweb.render("default"));
return Promise.resolve(h("div"));
}
this.__widget__.isStarted = true;
if (this.inlineTemplate) {
web/static/src/ts/core/qweb_vdom.ts
+2 -2
View File
@@ -821,12 +821,12 @@ const widgetDirective: Directive = {
ctx.dedent();
ctx.addLine(`} else {`); // not started
ctx.indent();
ctx.addLine(`isNew${widgetID} = true`);
ctx.addLine(
`if (props${widgetID} === w${widgetID}.__widget__.renderProps) {`
);
ctx.indent();
ctx.addLine(`def${defID} = w${widgetID}.__widget__.renderPromise;`);
ctx.addLine(`isNew${widgetID} = true`);
ctx.dedent();
ctx.addLine(`} else {`);
ctx.indent();
@@ -880,7 +880,7 @@ const widgetDirective: Directive = {
ctx.addLine(`} else {`);
ctx.indent();
ctx.addLine(
`def${defID} = def${defID}.then(()=>{let vnode=h(w${widgetID}.__widget__.vnode.sel, {key: ${templateID}});vnode.elm=w${widgetID}.el;c${
`def${defID} = def${defID}.then(()=>{if (!w${widgetID}.__widget__.vnode) {return};let vnode=h(w${widgetID}.__widget__.vnode.sel, {key: ${templateID}});vnode.elm=w${widgetID}.el;c${
ctx.parentNode
}[_${dummyID}_index]=vnode;vnode.data.hook = {insert(a){a.elm.parentNode.replaceChild(w${widgetID}.el,a.elm);a.elm=w${widgetID}.el;w${widgetID}.__mount();},remove(){w${widgetID}.${
keepAlive ? "detach" : "destroy"