From 1932ea0454cf508dd129ead83a741bb74f9f9159 Mon Sep 17 00:00:00 2001
From: Emma Malysz <emalysz@mozilla.com>
Date: Wed, 8 Apr 2020 21:38:56 +0000
Subject: [PATCH] Bug 1590573 - Followup: Revert changes on elements that don't
 use MozXULElement. CLOSED TREE

CLOSED TREE

Differential Revision: https://phabricator.services.mozilla.com/D70261

--HG--
extra : histedit_source : 02e207270852df2de6e07100aa7632c179a6e5dc
---
 .../customizableui/CustomizableWidgets.jsm    | 65 +++++++++----------
 .../components/preferences/in-content/main.js | 54 +++++++--------
 .../mozapps/extensions/content/aboutaddons.js | 27 +++-----
 3 files changed, 63 insertions(+), 83 deletions(-)

diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm
index d0793d2580d2..7d6274ab1cdf 100644
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -941,45 +941,44 @@ if (Services.prefs.getBoolPref("privacy.panicButton.enabled")) {
           break;
       }
     },
-    get markup() {
-      return `
-        <vbox class="panel-subview-body">
-          <hbox id="PanelUI-panic-timeframe">
-            <image id="PanelUI-panic-timeframe-icon" alt=""/>
-            <vbox flex="1">
-              <description data-l10n-id="panic-main-timeframe-desc" id="PanelUI-panic-mainDesc"></description>
-              <radiogroup id="PanelUI-panic-timeSpan" aria-labelledby="PanelUI-panic-mainDesc" closemenu="none">
-                <radio id="PanelUI-panic-5min" data-l10n-id="panic-button-5min" selected="true"
-                      value="5" class="subviewradio"/>
-                <radio id="PanelUI-panic-2hr" data-l10n-id="panic-button-2hr"
-                      value="2" class="subviewradio"/>
-                <radio id="PanelUI-panic-day" data-l10n-id="panic-button-day"
-                      value="6" class="subviewradio"/>
-              </radiogroup>
-            </vbox>
-          </hbox>
-          <vbox id="PanelUI-panic-explanations">
-            <label id="PanelUI-panic-actionlist-main-label" data-l10n-id="panic-button-action-desc"></label>
-
-            <label id="PanelUI-panic-actionlist-windows" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-delete-tabs-and-windows"></label>
-            <label id="PanelUI-panic-actionlist-cookies" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-delete-cookies"></label>
-            <label id="PanelUI-panic-actionlist-history" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-delete-history"></label>
-            <label id="PanelUI-panic-actionlist-newwindow" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-open-new-window"></label>
-
-            <label id="PanelUI-panic-warning" data-l10n-id="panic-button-undo-warning"></label>
-          </vbox>
-          <button id="PanelUI-panic-view-button"
-                  data-l10n-id="panic-button-forget-button"/>
-        </vbox>
-      `;
-    },
     onViewShowing(aEvent) {
       let win = aEvent.target.ownerGlobal;
       let doc = win.document;
       let eventBlocker = null;
       if (!doc.querySelector("#PanelUI-panic-timeframe")) {
         win.MozXULElement.insertFTLIfNeeded("browser/panicButton.ftl");
-        aEvent.target.appendChild(this.constructor.fragment);
+        let frag = win.MozXULElement.parseXULToFragment(`
+          <vbox class="panel-subview-body">
+            <hbox id="PanelUI-panic-timeframe">
+              <image id="PanelUI-panic-timeframe-icon" alt=""/>
+              <vbox flex="1">
+                <description data-l10n-id="panic-main-timeframe-desc" id="PanelUI-panic-mainDesc"></description>
+                <radiogroup id="PanelUI-panic-timeSpan" aria-labelledby="PanelUI-panic-mainDesc" closemenu="none">
+                  <radio id="PanelUI-panic-5min" data-l10n-id="panic-button-5min" selected="true"
+                        value="5" class="subviewradio"/>
+                  <radio id="PanelUI-panic-2hr" data-l10n-id="panic-button-2hr"
+                        value="2" class="subviewradio"/>
+                  <radio id="PanelUI-panic-day" data-l10n-id="panic-button-day"
+                        value="6" class="subviewradio"/>
+                </radiogroup>
+              </vbox>
+            </hbox>
+            <vbox id="PanelUI-panic-explanations">
+              <label id="PanelUI-panic-actionlist-main-label" data-l10n-id="panic-button-action-desc"></label>
+
+              <label id="PanelUI-panic-actionlist-windows" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-delete-tabs-and-windows"></label>
+              <label id="PanelUI-panic-actionlist-cookies" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-delete-cookies"></label>
+              <label id="PanelUI-panic-actionlist-history" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-delete-history"></label>
+              <label id="PanelUI-panic-actionlist-newwindow" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-open-new-window"></label>
+
+              <label id="PanelUI-panic-warning" data-l10n-id="panic-button-undo-warning"></label>
+            </vbox>
+            <button id="PanelUI-panic-view-button"
+                    data-l10n-id="panic-button-forget-button"/>
+          </vbox>
+        `);
+
+        aEvent.target.appendChild(frag);
         eventBlocker = doc.l10n.translateElements([aEvent.target]);
       }
 
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
index 56ac46c01e47..b55a812af3f4 100644
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -3093,40 +3093,32 @@ function getLocalHandlerApp(aFile) {
   return localHandlerApp;
 }
 
+// eslint-disable-next-line no-undef
+let gHandlerListItemFragment = MozXULElement.parseXULToFragment(`
+  <richlistitem>
+    <hbox flex="1" equalsize="always">
+      <hbox class="typeContainer" flex="1" align="center">
+        <image class="typeIcon" width="16" height="16"
+               src="moz-icon://goat?size=16"/>
+        <label class="typeDescription" flex="1" crop="end"/>
+      </hbox>
+      <hbox class="actionContainer" flex="1" align="center">
+        <image class="actionIcon" width="16" height="16"/>
+        <label class="actionDescription" flex="1" crop="end"/>
+      </hbox>
+      <hbox class="actionsMenuContainer" flex="1">
+        <menulist class="actionsMenu" flex="1" crop="end" selectedIndex="1">
+          <menupopup/>
+        </menulist>
+      </hbox>
+    </hbox>
+  </richlistitem>
+`);
+
 /**
  * This is associated to <richlistitem> elements in the handlers view.
  */
 class HandlerListItem {
-  static get fragment() {
-    if (!this.hasOwnProperty("_fragment")) {
-      this._fragment = MozXULElement.parseXULToFragment(this.markup);
-    }
-    return document.importNode(this._fragment, true);
-  }
-
-  static get markup() {
-    return `
-    <richlistitem>
-      <hbox flex="1" equalsize="always">
-        <hbox class="typeContainer" flex="1" align="center">
-          <image class="typeIcon" width="16" height="16"
-                 src="moz-icon://goat?size=16"/>
-          <label class="typeDescription" flex="1" crop="end"/>
-        </hbox>
-        <hbox class="actionContainer" flex="1" align="center">
-          <image class="actionIcon" width="16" height="16"/>
-          <label class="actionDescription" flex="1" crop="end"/>
-        </hbox>
-        <hbox class="actionsMenuContainer" flex="1">
-          <menulist class="actionsMenu" flex="1" crop="end" selectedIndex="1">
-            <menupopup/>
-          </menulist>
-        </hbox>
-      </hbox>
-    </richlistitem>
-    `;
-  }
-
   static forNode(node) {
     return gNodeToObjectMap.get(node);
   }
@@ -3147,7 +3139,7 @@ class HandlerListItem {
   }
 
   createNode(list) {
-    list.appendChild(this.constructor.fragment);
+    list.appendChild(document.importNode(gHandlerListItemFragment, true));
     this.node = list.lastChild;
     gNodeToObjectMap.set(this.node, this);
   }
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.js b/toolkit/mozapps/extensions/content/aboutaddons.js
index 1a56668eada7..42a3b81ad7b9 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.js
+++ b/toolkit/mozapps/extensions/content/aboutaddons.js
@@ -2170,31 +2170,20 @@ class FiveStarRating extends HTMLElement {
 customElements.define("five-star-rating", FiveStarRating);
 
 class ContentSelectDropdown extends HTMLElement {
-  static get markup() {
-    return `
-    <menulist popuponly="true" id="ContentSelectDropdown" hidden="true">
-      <menupopup rolluponmousewheel="true" activateontab="true"
-                 position="after_start" level="parent"/>
-    </menulist>
-    `;
-  }
-
-  static get fragment() {
-    if (!this.constructor.hasOwnProperty("_fragment")) {
-      this.constructor._fragment = MozXULElement.parseXULToFragment(
-        this.constructor.markup
-      );
-    }
-    return document.importNode(this.constructor._fragment, true);
-  }
-
   connectedCallback() {
     if (this.children.length) {
       return;
     }
     // This creates the menulist and menupopup elements needed for the inline
     // browser to support <select> elements and context menus.
-    this.appendChild(this.constructor.fragment);
+    this.appendChild(
+      MozXULElement.parseXULToFragment(`
+      <menulist popuponly="true" id="ContentSelectDropdown" hidden="true">
+        <menupopup rolluponmousewheel="true" activateontab="true"
+                   position="after_start" level="parent"/>
+      </menulist>
+    `)
+    );
   }
 }
 customElements.define("content-select-dropdown", ContentSelectDropdown);