Add this.window in Plugin

robinlej · FrancoisGe · commit 9b1e0935b4eb · 2025-05-07T17:28:00.000+02:00
diff --git a/addons/html_builder/static/src/website_builder/plugins/customize_website_plugin.js b/addons/html_builder/static/src/website_builder/plugins/customize_website_plugin.js
@@ -77,9 +77,7 @@ export class CustomizeWebsitePlugin extends Plugin {
             }),
             customizeWebsiteColor: this.withCustomHistory({
                 getValue: ({ params: { mainParam: color, colorType, gradientColor } }) => {
-                    const style = this.document.defaultView.getComputedStyle(
-                        this.document.documentElement
-                    );
+                    const style = this.window.getComputedStyle(this.document.documentElement);
                     if (gradientColor) {
                         const gradientValue = this.getWebsiteVariableValue(gradientColor);
                         if (gradientValue) {
@@ -179,9 +177,7 @@ export class CustomizeWebsitePlugin extends Plugin {
                     if (bgImage === "none") {
                         return "NONE";
                     }
-                    const style = this.document.defaultView.getComputedStyle(
-                        this.document.documentElement
-                    );
+                    const style = this.window.getComputedStyle(this.document.documentElement);
                     return getCSSVariableValue("body-image-type", style);
                 },
                 load: async ({ editingElement: el, params, value, historyImageSrc }) => {
@@ -265,9 +261,7 @@ export class CustomizeWebsitePlugin extends Plugin {
                     return currentValue === value;
                 },
                 getValue: ({ params: { mainParam: which } }) => {
-                    const style = this.document.defaultView.getComputedStyle(
-                        this.document.documentElement
-                    );
+                    const style = this.window.getComputedStyle(this.document.documentElement);
                     const isOutline = getCSSVariableValue(`btn-${which}-outline`, style);
                     const isFlat = getCSSVariableValue(`btn-${which}-flat`, style);
                     return isFlat === "true" ? "flat" : isOutline === "true" ? "outline" : "fill";
@@ -321,7 +315,7 @@ export class CustomizeWebsitePlugin extends Plugin {
         };
     }
     getWebsiteVariableValue(variable) {
-        const style = this.document.defaultView.getComputedStyle(this.document.documentElement);
+        const style = this.window.getComputedStyle(this.document.documentElement);
         let finalValue = getCSSVariableValue(variable, style);
         /* TODO dedicated action ?
         if (!params.colorNames) {
diff --git a/addons/html_builder/static/src/website_builder/plugins/options/animate_option_plugin.js b/addons/html_builder/static/src/website_builder/plugins/options/animate_option_plugin.js
@@ -136,7 +136,7 @@ class AnimateOptionPlugin extends Plugin {
             setAnimateIntensity: {
                 getValue: ({ editingElement }) => {
                     const intensity = parseInt(
-                        this.document.defaultView
+                        this.window
                             .getComputedStyle(editingElement)
                             .getPropertyValue("--wanim-intensity")
                     );
@@ -186,7 +186,7 @@ class AnimateOptionPlugin extends Plugin {
             // Trigger a DOM reflow.
             void editingElement.offsetWidth;
             editingElement.style.animationName = "";
-            this.document.defaultView.dispatchEvent(new Event("resize"));
+            this.window.dispatchEvent(new Event("resize"));
         } else {
             // Trigger a DOM reflow (Needed to prevent the animation from
             // being launched twice when previewing the "Intensity" option).
diff --git a/addons/html_builder/static/src/website_builder/plugins/options/chart_option_plugin.js b/addons/html_builder/static/src/website_builder/plugins/options/chart_option_plugin.js
@@ -263,7 +263,7 @@ class ChartOptionPlugin extends Plugin {
             ? color
             : getCSSVariableValue(
                   color,
-                  this.document.defaultView.getComputedStyle(this.document.documentElement)
+                  this.window.getComputedStyle(this.document.documentElement)
               );
     }
 
diff --git a/addons/html_builder/static/src/website_builder/plugins/options/navtabs_header_buttons_plugin.js b/addons/html_builder/static/src/website_builder/plugins/options/navtabs_header_buttons_plugin.js
@@ -32,7 +32,7 @@ class NavTabsOptionPlugin extends Plugin {
     }
 
     showTab(navLinkEl, paneEl) {
-        this.document.defaultView.Tab.getOrCreateInstance(navLinkEl).show();
+        this.window.Tab.getOrCreateInstance(navLinkEl).show();
         // Immediately show the pane so the history remains consistent.
         paneEl.classList.add("show");
     }
diff --git a/addons/html_builder/static/src/website_builder/plugins/options/popup_option_plugin.js b/addons/html_builder/static/src/website_builder/plugins/options/popup_option_plugin.js
@@ -38,8 +38,6 @@ class PopupOptionPlugin extends Plugin {
     };
 
     setup() {
-        this.window = this.document.defaultView;
-
         this.addDomListener(this.editable, "click", (ev) => {
             // Note: links are excluded here so that internal modal buttons do
             // not close the popup as we want to allow edition of those buttons.
diff --git a/addons/html_builder/static/src/website_builder/plugins/theme/theme_tab_plugin.js b/addons/html_builder/static/src/website_builder/plugins/theme/theme_tab_plugin.js
@@ -107,7 +107,7 @@ export class ThemeTabPlugin extends Plugin {
         const hues = [];
         const saturationDiffs = [];
         let oneHasNoSaturation = false;
-        const style = this.document.defaultView.getComputedStyle(this.document.body);
+        const style = this.window.getComputedStyle(this.document.body);
         const baseStyle = getComputedStyle(document.body);
         for (let id = 100; id <= 900; id += 100) {
             const gray = getCSSVariableValue(`${id}`, style);
diff --git a/addons/html_builder/static/src/website_builder/plugins/website_session_plugin.js b/addons/html_builder/static/src/website_builder/plugins/website_session_plugin.js
@@ -6,7 +6,7 @@ export class WebsiteSessionPlugin extends Plugin {
     static shared = ["getSession"];
 
     getSession() {
-        return this.document.defaultView.odoo.loader.modules.get("@web/session").session;
+        return this.window.odoo.loader.modules.get("@web/session").session;
     }
 }
 
diff --git a/addons/html_editor/static/src/core/overlay_plugin.js b/addons/html_editor/static/src/core/overlay_plugin.js
@@ -24,7 +24,7 @@ export class OverlayPlugin extends Plugin {
     overlays = [];
 
     setup() {
-        this.iframe = this.document.defaultView.frameElement;
+        this.iframe = this.window.frameElement;
         this.topDocument = this.iframe?.ownerDocument || this.document;
         this.container = this.getScrollContainer();
         this.throttledUpdateContainer = throttleForAnimation(() => {
diff --git a/addons/html_editor/static/src/core/sanitize_plugin.js b/addons/html_editor/static/src/core/sanitize_plugin.js
@@ -18,7 +18,7 @@ export class SanitizePlugin extends Plugin {
         if (!window.DOMPurify) {
             throw new Error("DOMPurify is not available");
         }
-        this.DOMPurify = DOMPurify(this.document.defaultView);
+        this.DOMPurify = DOMPurify(this.window);
     }
     /**
      * Sanitizes in place an html element. Current implementation uses the
diff --git a/addons/html_editor/static/src/core/shortcut_plugin.js b/addons/html_editor/static/src/core/shortcut_plugin.js
@@ -28,7 +28,7 @@ export class ShortCutPlugin extends Plugin {
             throw new Error("ShorcutPlugin needs hotkey service to properly work");
         }
         if (document !== this.document) {
-            hotkeyService.registerIframe({ contentWindow: this.document.defaultView });
+            hotkeyService.registerIframe({ contentWindow: this.window });
         }
         for (const shortcut of this.getResource("shortcuts")) {
             const command = this.dependencies.userCommand.getCommand(shortcut.commandId);
diff --git a/addons/html_editor/static/src/main/list/list_plugin.js b/addons/html_editor/static/src/main/list/list_plugin.js
@@ -955,7 +955,7 @@ export class ListPlugin extends Plugin {
      * @param {HTMLLIElement} li - LI element inside a checklist.
      */
     isPointerInsideCheckbox(li, pointerOffsetX, pointerOffsetY) {
-        const beforeStyle = this.document.defaultView.getComputedStyle(li, ":before");
+        const beforeStyle = this.window.getComputedStyle(li, ":before");
         const checkboxPosition = {
             left: parseInt(beforeStyle.left),
             top: parseInt(beforeStyle.top),
@@ -1047,13 +1047,11 @@ export class ListPlugin extends Plugin {
             return;
         }
         const defaultPadding =
-            parseFloat(
-                this.document.defaultView.getComputedStyle(document.documentElement).fontSize
-            ) * 2; // 2rem
+            parseFloat(this.window.getComputedStyle(document.documentElement).fontSize) * 2; // 2rem
         // Align the whole list based on the item that requires the largest padding.
         const requiredPaddings = [...list.children].map((li) => {
             const markerWidth = Math.floor(
-                parseFloat(this.document.defaultView.getComputedStyle(li, "::marker").width)
+                parseFloat(this.window.getComputedStyle(li, "::marker").width)
             );
             // For `UL` with large font size the marker width is so big that more padding is needed.
             const paddingForMarker =
diff --git a/addons/html_editor/static/src/main/position_plugin.js b/addons/html_editor/static/src/main/position_plugin.js
@@ -22,8 +22,8 @@ export class PositionPlugin extends Plugin {
         this.resizeObserver.observe(this.document.body);
         this.resizeObserver.observe(this.editable);
         this.addDomListener(window, "resize", this.layoutGeometryChange);
-        if (this.document.defaultView !== window) {
-            this.addDomListener(this.document.defaultView, "resize", this.layoutGeometryChange);
+        if (this.window !== window) {
+            this.addDomListener(this.window, "resize", this.layoutGeometryChange);
         }
         const scrollableElements = [this.editable, ...ancestors(this.editable)].filter((node) => {
             return couldBeScrollableX(node) || couldBeScrollableY(node);
diff --git a/addons/html_editor/static/src/others/qweb_plugin.js b/addons/html_editor/static/src/others/qweb_plugin.js
@@ -99,7 +99,7 @@ export class QWebPlugin extends Plugin {
             } else {
                 return (
                     child.nodeType !== Node.ELEMENT_NODE ||
-                    this.document.defaultView.getComputedStyle(child).display === "inline"
+                    this.window.getComputedStyle(child).display === "inline"
                 );
             }
         });
diff --git a/addons/html_editor/static/src/plugin.js b/addons/html_editor/static/src/plugin.js
@@ -21,6 +21,8 @@ export class Plugin {
     constructor(document, editable, dependencies, config, services) {
         /** @type { Document } **/
         this.document = document;
+        /** @type { Window } */
+        this.window = document.defaultView;
         /** @type { HTMLElement } **/
         this.editable = editable;
         /** @type { EditorConfig } **/

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ class ChartOptionPlugin extends Plugin {`
`263`	`263`	`? color`
`264`	`264`	`: getCSSVariableValue(`
`265`	`265`	`color,`
`266`		`- this.document.defaultView.getComputedStyle(this.document.documentElement)`
	`266`	`+ this.window.getComputedStyle(this.document.documentElement)`
`267`	`267`	`);`
`268`	`268`	`}`
`269`	`269`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class NavTabsOptionPlugin extends Plugin {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`showTab(navLinkEl, paneEl) {`
`35`		`- this.document.defaultView.Tab.getOrCreateInstance(navLinkEl).show();`
	`35`	`+ this.window.Tab.getOrCreateInstance(navLinkEl).show();`
`36`	`36`	`// Immediately show the pane so the history remains consistent.`
`37`	`37`	`paneEl.classList.add("show");`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export class WebsiteSessionPlugin extends Plugin {`
`6`	`6`	`static shared = ["getSession"];`
`7`	`7`
`8`	`8`	`getSession() {`
`9`		`- return this.document.defaultView.odoo.loader.modules.get("@web/session").session;`
	`9`	`+ return this.window.odoo.loader.modules.get("@web/session").session;`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export class SanitizePlugin extends Plugin {`
`18`	`18`	`if (!window.DOMPurify) {`
`19`	`19`	`throw new Error("DOMPurify is not available");`
`20`	`20`	`}`
`21`		`- this.DOMPurify = DOMPurify(this.document.defaultView);`
	`21`	`+ this.DOMPurify = DOMPurify(this.window);`
`22`	`22`	`}`
`23`	`23`	`/**`
`24`	`24`	`* Sanitizes in place an html element. Current implementation uses the`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export class ShortCutPlugin extends Plugin {`
`28`	`28`	`throw new Error("ShorcutPlugin needs hotkey service to properly work");`
`29`	`29`	`}`
`30`	`30`	`if (document !== this.document) {`
`31`		`- hotkeyService.registerIframe({ contentWindow: this.document.defaultView });`
	`31`	`+ hotkeyService.registerIframe({ contentWindow: this.window });`
`32`	`32`	`}`
`33`	`33`	`for (const shortcut of this.getResource("shortcuts")) {`
`34`	`34`	`const command = this.dependencies.userCommand.getCommand(shortcut.commandId);`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ export class QWebPlugin extends Plugin {`
`99`	`99`	`} else {`
`100`	`100`	`return (`
`101`	`101`	`child.nodeType !== Node.ELEMENT_NODE \|\|`
`102`		`- this.document.defaultView.getComputedStyle(child).display === "inline"`
	`102`	`+ this.window.getComputedStyle(child).display === "inline"`
`103`	`103`	`);`
`104`	`104`	`}`
`105`	`105`	`});`