зеркало из https://github.com/mozilla/pjs.git
Bug 301069 - Expose dialog titles on OS X (Dialog orgin spoofing isn't fixed on Mac). r=josh/mconnnor, a=mconnor
This commit is contained in:
Родитель
0124997ae5
Коммит
6c3150163e
|
@ -99,7 +99,11 @@ function setLabelForNode(aNode, aLabel, aIsLabelFlag)
|
|||
function commonDialogOnLoad()
|
||||
{
|
||||
// set the document title
|
||||
#ifdef XP_MACOSX
|
||||
setElementText("info.title", gCommonDialogParam.GetString(12), true);
|
||||
#else
|
||||
document.title = gCommonDialogParam.GetString(12);
|
||||
#endif
|
||||
|
||||
// set the number of command buttons
|
||||
var nButtons = gCommonDialogParam.GetInt(2);
|
||||
|
|
|
@ -21,6 +21,11 @@
|
|||
</hbox>
|
||||
|
||||
<vbox flex="1" style="max-width: 45em;">
|
||||
#ifdef XP_MACOSX
|
||||
# On mac, we're exposing the dialog title inside the dialog
|
||||
<!-- Dialog title -->
|
||||
<description id="info.title" class="dialogTitle"/>
|
||||
#endif
|
||||
<!-- text -->
|
||||
<description id="info.header" class="header"/>
|
||||
<vbox id="info.box"/>
|
||||
|
|
|
@ -10,8 +10,8 @@ toolkit.jar:
|
|||
+ content/global/buildconfig.html (buildconfig.html)
|
||||
+ content/global/charsetOverlay.js (charsetOverlay.js)
|
||||
+ content/global/charsetOverlay.xul (charsetOverlay.xul)
|
||||
+ content/global/commonDialog.js (commonDialog.js)
|
||||
+ content/global/commonDialog.xul (commonDialog.xul)
|
||||
*+ content/global/commonDialog.js (commonDialog.js)
|
||||
*+ content/global/commonDialog.xul (commonDialog.xul)
|
||||
* content/global/contentAreaUtils.js (contentAreaUtils.js)
|
||||
* content/global/customizeCharset.js (customizeCharset.js)
|
||||
* content/global/customizeCharset.xul (customizeCharset.xul)
|
||||
|
|
|
@ -223,12 +223,14 @@
|
|||
}
|
||||
|
||||
#commonDialog > hbox > vbox > description, #commonDialog > hbox > vbox > vbox > description {
|
||||
font: menu;
|
||||
font-weight: bold !important;
|
||||
line-height: 16px;
|
||||
margin-bottom: 6px;
|
||||
font: menu;
|
||||
line-height: 16px;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
#commonDialog .dialogTitle {
|
||||
font-weight: bold !important;
|
||||
}
|
||||
|
||||
/* class for text with a 'link' appearance */
|
||||
.text-link
|
||||
|
|
Загрузка…
Ссылка в новой задаче