mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-09 06:22:08 +00:00
Checking in fix for adding Help button to Table Properties dialog for brade, b=88377, r=cmanske, sr=sfraser. Includes fix for missing menulist in this dialog: b=89644, r=brade, sr=sfraser
This commit is contained in:
parent
2e2b2640e3
commit
bb41c589c5
@ -161,3 +161,4 @@ StopLinks=Discontinue Link
|
||||
NoAltText=It is recommended that you supply alternate text that will appear in text-only browsers, and that will appear in other browsers when an image is loading or when image loading is disabled.
|
||||
SaveImageAs=Save Image (%NAME%)...
|
||||
NoSeparatorCharacter=Please enter a single character to use for separating into columns
|
||||
Apply=Apply
|
||||
|
@ -218,7 +218,7 @@ function Startup()
|
||||
}
|
||||
}
|
||||
|
||||
doSetOKCancel(onOK, onCancel);
|
||||
doSetOKCancel(onOK, onCancel, 0, onApply);
|
||||
|
||||
// Note: we must use TableElement, not globalTableElement for these,
|
||||
// thus we should not put this in InitDialog.
|
||||
@ -261,6 +261,14 @@ function Startup()
|
||||
|
||||
function InitDialog()
|
||||
{
|
||||
// turn on Button3 to be "apply"
|
||||
var applyButton = document.getElementById("Button3");
|
||||
if (applyButton)
|
||||
{
|
||||
applyButton.label = GetString("Apply");
|
||||
applyButton.removeAttribute("collapsed");
|
||||
}
|
||||
|
||||
// Get Table attributes
|
||||
dialog.TableRowsInput.value = rowCount;
|
||||
dialog.TableColumnsInput.value = colCount;
|
||||
@ -1222,6 +1230,12 @@ function SetCloseButton()
|
||||
}
|
||||
}
|
||||
|
||||
function onApply()
|
||||
{
|
||||
Apply();
|
||||
return false; // don't close window
|
||||
}
|
||||
|
||||
function Apply()
|
||||
{
|
||||
if (ValidateData())
|
||||
|
@ -41,6 +41,7 @@
|
||||
<script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
|
||||
<script type="application/x-javascript" src="chrome://editor/content/EdTableProps.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
|
||||
<script type="application/x-javascript" src="chrome://help/content/help.js"/>
|
||||
|
||||
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
|
||||
<broadcaster id="args" value=""/>
|
||||
@ -71,7 +72,7 @@
|
||||
</grid>
|
||||
<spring class="bigspacer"/>
|
||||
<grid>
|
||||
<columns><column/><column/><column/></columns>
|
||||
<columns><column/><column/><column flex="1"/></columns>
|
||||
<rows>
|
||||
<row valign="middle">
|
||||
<text class="label" value="&tableWidth.label;"/>
|
||||
@ -268,8 +269,7 @@
|
||||
<!-- from EdDialogOverlay -->
|
||||
<box>
|
||||
<spring flex="1"/>
|
||||
<button class="dialog" label="&applyButton.label;" oncommand="Apply();"/>
|
||||
<box id="okCancelButtons"/>
|
||||
<box id="okCancelHelpButtonsRight"/>
|
||||
</box>
|
||||
</tabbox>
|
||||
</window>
|
||||
|
@ -39,7 +39,6 @@
|
||||
<!ENTITY tableCaptionBelow.label "Below Table">
|
||||
<!ENTITY tableCaptionNone.label "None">
|
||||
<!ENTITY tableInheritColor.label "(Let page color show through)">
|
||||
<!ENTITY applyButton.label "Apply">
|
||||
|
||||
<!ENTITY cellPercent.label "percent of table">
|
||||
<!ENTITY cellSelection.label "Selection">
|
||||
|
Loading…
Reference in New Issue
Block a user