From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- .../formautofill/content/editAddress.xhtml | 94 +++++----------------- 1 file changed, 18 insertions(+), 76 deletions(-) (limited to 'browser/extensions/formautofill/content/editAddress.xhtml') diff --git a/browser/extensions/formautofill/content/editAddress.xhtml b/browser/extensions/formautofill/content/editAddress.xhtml index 47ae4a2a3b..a23fa5ab8c 100644 --- a/browser/extensions/formautofill/content/editAddress.xhtml +++ b/browser/extensions/formautofill/content/editAddress.xhtml @@ -19,65 +19,13 @@ rel="stylesheet" href="chrome://formautofill/content/skin/editDialog.css" /> - - -

- - - - - - - - - - -

-        <span data-l10n-id="autofill-address-street" class="label-text" />
-      </label>
-      <label id="address-level3-container" class="container">
-        <input id="address-level3" type="text" />
-        <span class="label-text" />
-      </label>
-      <label id="address-level2-container" class="container">
-        <input id="address-level2" type="text" />
-        <span class="label-text" />
-      </label>
-      <label id="address-level1-container" class="container">
-        
-        <input id="address-level1" type="text" />
-        <span class="label-text" />
-      </label>
-      <label id="postal-code-container" class="container">
-        <input id="postal-code" type="text" />
-        <span class="label-text" />
-      </label>
-      <label id="country-container" class="container">
-        <select id="country" required="required">
-          <option />
-        </select>
-        <span data-l10n-id="autofill-address-country" class="label-text" />
-      </label>
-      <label id="tel-container" class="container">
-        <input id="tel" type="tel" dir="auto" />
-        <span data-l10n-id="autofill-address-tel" class="label-text" />
-      </label>
-      <label id="email-container" class="container">
-        <input id="email" type="email" required="required" />
-        <span data-l10n-id="autofill-address-email" class="label-text" />
-      </label>
-    </form>
+    <form id="form" class="editAddressForm" autocomplete="off"></form>
     <div id="controls-container">
       <span
         id="country-warning-message"
@@ -88,31 +36,25 @@
         <button id="save" class="primary" data-l10n-id="autofill-save-button" />
       </moz-button-group>
     </div>
-    <script>
-      <![CDATA[
-          "use strict";
+    
+    <script type="module">
+      import { createFormLayoutFromRecord } from "chrome://formautofill/content/addressFormLayout.mjs";
+      import { EditAddressDialog } from "chrome://formautofill/content/editDialog.mjs";
 
-          const {
-            record,
-            noValidate,
-          } = window.arguments?.[0] ?? {};
+      const { record, noValidate, l10nStrings } = window.arguments?.[0] ?? {};
+      const formElement = document.querySelector("form");
+      formElement.noValidate = !!noValidate;
+      createFormLayoutFromRecord(formElement, record, l10nStrings);
 
-          /* import-globals-from autofillEditForms.js */
-          const fieldContainer = new EditAddress({
-            form: document.getElementById("form"),
-          }, record, {
-            noValidate,
-          });
-
-          /* import-globals-from editDialog.js */
-          new EditAddressDialog({
-            title: document.querySelector("title"),
-            fieldContainer,
-            controlsContainer: document.getElementById("controls-container"),
-            cancel: document.getElementById("cancel"),
-            save: document.getElementById("save"),
-          }, record);
-        ]]>
+      new EditAddressDialog(
+        {
+          title: document.querySelector("title"),
+          cancel: document.getElementById("cancel"),
+          save: document.getElementById("save"),
+        },
+        record
+      );
     </script>
+    
   </body>
 </html>
-- 
cgit v1.2.3