Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1416875 - Renamed prompt IDs from the form of info.body to InfoBody so they won't need escaping. r=jaws

Browse Source 
--HG--
extra : rebase_source : cd932973a6b675ff45c4a4c9eadc68e3303f6d11
This commit is contained in:
gorovoja 2017-11-17 13:59:30 -05:00
parent f72d7494e0
commit 76b56b8d23
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/components/prompts/content/commonDialog.css
View File

@ -8,7 +8,7 @@
max-width: 45em;
}
#info\.body {
#infoBody {
-moz-user-focus: normal;
-moz-user-select: text;
cursor: text !important;

6
toolkit/components/prompts/content/commonDialog.js
View File

@ -33,9 +33,9 @@ function commonDialogOnLoad() {
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"),

8
toolkit/components/prompts/content/commonDialog.xul
View File

@ -12,7 +12,7 @@
<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;"
@ -61,7 +61,7 @@
<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
@ -69,14 +69,14 @@
#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">

4
toolkit/components/prompts/content/tabprompts.css
View File

@ -16,12 +16,12 @@ tabmodalprompt {
-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;

10
toolkit/components/prompts/content/tabprompts.xml
View File

@ -28,7 +28,7 @@
<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"/>
@ -42,8 +42,8 @@
<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">
@ -101,8 +101,8 @@
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"),

2
toolkit/themes/linux/global/commonDialog.css
View File

@ -13,7 +13,7 @@
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

2
toolkit/themes/linux/global/global.css
View File

@ -62,7 +62,7 @@ window.dialog {
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");
}

10
toolkit/themes/osx/global/commonDialog.css
View File

@ -18,18 +18,18 @@
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;
}

2
toolkit/themes/osx/global/global.css
View File

@ -68,7 +68,7 @@ window.dialog {
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");
}

2
toolkit/themes/windows/global/global.css
View File

@ -60,7 +60,7 @@ window.dialog {
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");
}