Bug 1416875 - Renamed prompt IDs from the form of info.body to InfoBody so they won't need escaping. r=jaws
authorgorovoja <gorovoja@coventry.ac.uk>
Fri, 17 Nov 2017 13:59:30 -0500
changeset 392879 491fbd1c506fd120aec340b1c5a0d98a888fbdd5
parent 392878 1516807b05d3f6084b58d54b12032ccce5cbdcfc
child 392880 840cf9044de30a0ddddff5904c9415a8a074faf8
push id97557
push userjwein@mozilla.com
push dateTue, 21 Nov 2017 19:50:18 +0000
treeherdermozilla-inbound@491fbd1c506f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1416875
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1416875 - Renamed prompt IDs from the form of info.body to InfoBody so they won't need escaping. r=jaws
toolkit/components/prompts/content/commonDialog.css
toolkit/components/prompts/content/commonDialog.js
toolkit/components/prompts/content/commonDialog.xul
toolkit/components/prompts/content/tabprompts.css
toolkit/components/prompts/content/tabprompts.xml
toolkit/themes/linux/global/commonDialog.css
toolkit/themes/linux/global/global.css
toolkit/themes/osx/global/commonDialog.css
toolkit/themes/osx/global/global.css
toolkit/themes/windows/global/global.css
--- a/toolkit/components/prompts/content/commonDialog.css
+++ b/toolkit/components/prompts/content/commonDialog.css
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */
 
 #infoContainer {
   max-width: 45em;
 }
 
-#info\.body {
+#infoBody {
   -moz-user-focus: normal;
   -moz-user-select: text;
   cursor: text !important;
   white-space: pre-wrap;
   unicode-bidi: plaintext;
 }
 
 #loginLabel, #password1Label {
--- a/toolkit/components/prompts/content/commonDialog.js
+++ b/toolkit/components/prompts/content/commonDialog.js
@@ -28,19 +28,19 @@ function commonDialogOnLoad() {
     let ui = {
         prompt: window,
         loginContainer: document.getElementById("loginContainer"),
         loginTextbox: document.getElementById("loginTextbox"),
         loginLabel: document.getElementById("loginLabel"),
         password1Container: document.getElementById("password1Container"),
         password1Textbox: document.getElementById("password1Textbox"),
         password1Label: document.getElementById("password1Label"),
-        infoBody: document.getElementById("info.body"),
-        infoTitle: document.getElementById("info.title"),
-        infoIcon: document.getElementById("info.icon"),
+        infoBody: document.getElementById("infoBody"),
+        infoTitle: document.getElementById("infoTitle"),
+        infoIcon: document.getElementById("infoIcon"),
         checkbox: document.getElementById("checkbox"),
         checkboxContainer: document.getElementById("checkboxContainer"),
         button3: dialog.getButton("extra2"),
         button2: dialog.getButton("extra1"),
         button1: dialog.getButton("cancel"),
         button0: dialog.getButton("accept"),
         focusTarget: window,
     };
--- a/toolkit/components/prompts/content/commonDialog.xul
+++ b/toolkit/components/prompts/content/commonDialog.xul
@@ -7,17 +7,17 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://global/content/commonDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://global/skin/commonDialog.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
 
 <dialog id="commonDialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        aria-describedby="info.body"
+        aria-describedby="infoBody"
         onunload="commonDialogOnUnload();"
         ondialogaccept="Dialog.onButton0(); return true;"
         ondialogcancel="Dialog.onButton1(); return true;"
         ondialogextra1="Dialog.onButton2(); window.close();"
         ondialogextra2="Dialog.onButton3(); window.close();"
         buttonpack="center">
 
   <script type="application/javascript" src="chrome://global/content/commonDialog.js"/>
@@ -56,32 +56,32 @@
     <columns>
       <column/>
       <column flex="1"/>
     </columns>
 
     <rows>
       <row>
         <hbox id="iconContainer" align="start">
-          <image id="info.icon" class="spaced"/>
+          <image id="infoIcon" class="spaced"/>
         </hbox>
         <vbox id="infoContainer"
 #ifndef XP_MACOSX
               pack="center"
 #endif
         >
           <!-- Only shown on OS X, since it has no dialog title -->
-          <description id="info.title"
+          <description id="infoTitle"
 #ifndef XP_MACOSX
             hidden="true"
 #else
             style="margin-bottom: 1em"
 #endif
           />
-          <description id="info.body" context="contentAreaContextMenu" noinitialfocus="true"/>
+          <description id="infoBody" context="contentAreaContextMenu" noinitialfocus="true"/>
         </vbox>
       </row>
       <row id="loginContainer" hidden="true" align="center">
         <label id="loginLabel" value="&editfield0.label;" control="loginTextbox"/>
         <textbox id="loginTextbox"/>
       </row>
       <row id ="password1Container" hidden="true" align="center">
         <label id="password1Label" value="&editfield1.label;" control="password1Textbox"/>
--- a/toolkit/components/prompts/content/tabprompts.css
+++ b/toolkit/components/prompts/content/tabprompts.css
@@ -11,22 +11,22 @@ tabmodalprompt {
 }
 
 .mainContainer {
   min-width: 20em;
   min-height: 12em;
   -moz-user-focus: normal;
 }
 
-.info\.title {
+.infoTitle {
   margin-bottom: 1em !important;
   font-weight: bold;
 }
 
-.info\.body {
+.infoBody {
   margin: 0 !important;
   -moz-user-focus: normal;
   -moz-user-select: text;
   cursor: text !important;
   white-space: pre-wrap;
   unicode-bidi: plaintext;
 }
 
--- a/toolkit/components/prompts/content/tabprompts.xml
+++ b/toolkit/components/prompts/content/tabprompts.xml
@@ -23,32 +23,32 @@
 
     <resources>
         <stylesheet src="chrome://global/content/tabprompts.css"/>
         <stylesheet src="chrome://global/skin/tabprompts.css"/>
     </resources>
 
     <xbl:content xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
                  role="dialog"
-                 aria-describedby="info.body">
+                 aria-describedby="infoBody">
 
         <!-- This is based on the guts of commonDialog.xul -->
         <spacer flex="1"/>
         <hbox pack="center">
             <vbox anonid="mainContainer" class="mainContainer">
                 <grid class="topContainer" flex="1">
                     <columns>
                         <column/>
                         <column flex="1"/>
                     </columns>
 
                     <rows>
                         <vbox anonid="infoContainer" align="center" pack="center" flex="1">
-                            <description anonid="info.title" class="info.title" hidden="true" />
-                            <description anonid="info.body" class="info.body"/>
+                            <description anonid="infoTitle" class="infoTitle" hidden="true" />
+                            <description anonid="infoBody" class="infoBody"/>
                         </vbox>
 
                         <row anonid="loginContainer" hidden="true" align="center">
                             <label anonid="loginLabel" value="&editfield0.label;" control="loginTextbox"/>
                             <textbox anonid="loginTextbox"/>
                         </row>
 
                         <row anonid="password1Container" hidden="true" align="center">
@@ -96,18 +96,18 @@
             this.ui = {
                 prompt: this,
                 loginContainer: getElement("loginContainer"),
                 loginTextbox: getElement("loginTextbox"),
                 loginLabel: getElement("loginLabel"),
                 password1Container: getElement("password1Container"),
                 password1Textbox: getElement("password1Textbox"),
                 password1Label: getElement("password1Label"),
-                infoBody: getElement("info.body"),
-                infoTitle: getElement("info.title"),
+                infoBody: getElement("infoBody"),
+                infoTitle: getElement("infoTitle"),
                 infoIcon: null,
                 checkbox: getElement("checkbox"),
                 checkboxContainer: getElement("checkboxContainer"),
                 button3: getElement("button3"),
                 button2: getElement("button2"),
                 button1: getElement("button1"),
                 button0: getElement("button0"),
                 // focusTarget (for BUTTON_DELAY_ENABLE) not yet supported
--- a/toolkit/themes/linux/global/commonDialog.css
+++ b/toolkit/themes/linux/global/commonDialog.css
@@ -8,15 +8,15 @@
 }
 
 #iconContainer {
   -moz-box-pack: center;
   min-height: 55px; /* maximum icon height + icon margin */
   min-width: 58px; /* maximum icon width + icon margin */
 }
 
-#info\.icon {
+#infoIcon {
   max-width: 48px;
   max-height: 48px;
   /* The 'spaced' class does this already. It's repeated here to make it clearer
      what margin values the #iconContainer's min-height and max-height depend on: */
   margin: 3px 5px 4px;
 }
--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@@ -57,17 +57,17 @@ window.dialog {
 }
 
 /* ::::: alert icons :::::*/
 
 .message-icon {
   list-style-image: url("moz-icon://stock/gtk-dialog-info?size=dialog");
 }
 
-.alert-dialog #info\.icon,
+.alert-dialog #infoIcon,
 .alert-icon {
   list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=dialog");
 }
 
 .error-icon {
   list-style-image: url("moz-icon://stock/gtk-dialog-error?size=dialog");
 }
 
--- a/toolkit/themes/osx/global/commonDialog.css
+++ b/toolkit/themes/osx/global/commonDialog.css
@@ -13,23 +13,23 @@
 #infoContainer {
   max-width: 33em;
 }
 
 #loginContainer {
   padding-top: 10px;
 }
 
-#info\.icon {
+#infoIcon {
   margin-inline-end: 14px;
 }
 
-#info\.title,
-#info\.header,
-#info\.body {
+#infoTitle,
+#infoHeader,
+#infoBody {
   font: menu;
   line-height: 16px;
   margin-bottom: 6px;
 }
 
-#info\.title {
+#infoTitle {
   font-weight: bold;
 }
--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -63,17 +63,17 @@ window.dialog {
   margin: 6px;
   margin-inline-end: 20px;
 }
 
 .message-icon {
   list-style-image: url("chrome://global/skin/icons/info.svg");
 }
 
-.alert-dialog #info\.icon,
+.alert-dialog #infoIcon,
 .alert-icon {
   list-style-image: url("chrome://global/skin/icons/warning-64.png");
 }
 
 .error-icon {
   list-style-image: url("chrome://global/skin/icons/error-64.png");
 }
 
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -55,17 +55,17 @@ window.dialog {
   width: 32px;
   height: 32px;
 }
 
 .message-icon {
   list-style-image: url("chrome://global/skin/icons/info.svg");
 }
 
-.alert-dialog #info\.icon,
+.alert-dialog #infoIcon,
 .alert-icon {
   list-style-image: url("chrome://global/skin/icons/Warning.png");
 }
 
 .error-icon {
   list-style-image: url("chrome://global/skin/icons/Error.png");
 }