Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 25 insertions, 5 deletions

diff --git a/toolkit/components/prompts/content/selectDialog.css b/toolkit/components/prompts/content/selectDialog.css
new file mode 100644
index 0000000000..923cb114d2
--- /dev/null
+++ b/toolkit/components/prompts/content/selectDialog.css
@@ -0,0 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+:root {
+  min-width: 29em;
+}
+
+#selectContainer {
+  max-width: 45em;
+  margin: 5px;
+}
diff --git a/toolkit/components/prompts/content/selectDialog.js b/toolkit/components/prompts/content/selectDialog.js
index 86809bc879..30d7de5c69 100644
--- a/toolkit/components/prompts/content/selectDialog.js
+++ b/toolkit/components/prompts/content/selectDialog.js
@@ -30,7 +30,8 @@ function onDCL() {
   document.title = propBag.getProperty("title");
 
   let text = propBag.getProperty("text");
-  document.getElementById("info.txt").setAttribute("value", text);
+  let element = document.getElementById("info.txt");
+  element.appendChild(document.createTextNode(text));
 
   let items = propBag.getProperty("list");
   listBox = document.getElementById("list");
diff --git a/toolkit/components/prompts/content/selectDialog.xhtml b/toolkit/components/prompts/content/selectDialog.xhtml
index 59918cdce0..70d0bbfdfd 100644
--- a/toolkit/components/prompts/content/selectDialog.xhtml
+++ b/toolkit/components/prompts/content/selectDialog.xhtml
@@ -10,13 +10,19 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
 >
-  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://global/content/selectDialog.css"
+    />
+  </linkset>
 
   <dialog>
     <script src="chrome://global/content/selectDialog.js" />
     <keyset id="dialogKeys" />
-    <vbox style="width: 24em; margin: 5px">
-      <label id="info.txt" />
+    <vbox id="selectContainer">
+      <description id="info.txt" />
       <vbox>
         <richlistbox id="list" class="theme-listbox" style="height: 8em" />
       </vbox>
diff --git a/toolkit/components/prompts/jar.mn b/toolkit/components/prompts/jar.mn
index 7a904c4363..e1eefe2149 100644
--- a/toolkit/components/prompts/jar.mn
+++ b/toolkit/components/prompts/jar.mn
@@ -9,3 +9,4 @@ toolkit.jar:
    content/global/commonDialog.css            (content/commonDialog.css)
    content/global/selectDialog.js             (content/selectDialog.js)
    content/global/selectDialog.xhtml          (content/selectDialog.xhtml)
+   content/global/selectDialog.css            (content/selectDialog.css)
diff --git a/toolkit/components/prompts/test/chromeScript.js b/toolkit/components/prompts/test/chromeScript.js
index f873c5d04b..cfcc2591c8 100644
--- a/toolkit/components/prompts/test/chromeScript.js
+++ b/toolkit/components/prompts/test/chromeScript.js
@@ -74,7 +74,7 @@ function getSelectState(ui) {
   let listbox = ui.getElementById("list");
 
   let state = {};
-  state.msg = ui.getElementById("info.txt").value;
+  state.msg = ui.getElementById("info.txt").firstChild.textContent;
   state.selectedIndex = listbox.selectedIndex;
   state.items = [];