Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed convert to table bugs in Composr, b=82404,82408,82409,96839 r=brade, sr=kin, a=dbaron

Browse Source
This commit is contained in:
cmanske%netscape.com 2001-08-31 04:09:23 +00:00
parent c6704e1401
commit 14df94e2a6
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
editor/ui/dialogs/content/EdConvertToTable.js
View File

@ -39,13 +39,11 @@ function Startup()
dialog.sepRadioGroup = document.getElementById("SepRadioGroup");
dialog.sepCharacterInput = document.getElementById("SepCharacterInput");
dialog.deleteSepCharacter = document.getElementById("DeleteSepCharacter");
dialog.collapseSpaces = document.getElementById("CollapseSpaces");
// We persist the user's separator character
dialog.sepCharacterInput.value = dialog.sepRadioGroup.getAttribute("character");
// Always default to deleting the separator character
dialog.deleteSepCharacter.checked = true;
gIndex = dialog.sepRadioGroup.getAttribute("index");
switch (gIndex)
@ -62,7 +60,7 @@ function Startup()
break;
}
// Set initial enable state on character input
// Set initial enable state on character input and "collapse" checkbox
SelectCharacter(gIndex);
SetTextboxFocus(dialog.sepRadioGroup);
@ -78,8 +76,8 @@ function InputSepCharacter()
if (str.length > 1)
str.slice(0,1);
// We can never allow tag delimeters for separator character
if (str == "<" || str == ">")
// We can never allow tag or entity delimeters for separator character
if (str == "<" || str == ">" || str == "&" || str == ";" || str == " ")
str = "";
dialog.sepCharacterInput.value = str;
@ -89,6 +87,7 @@ function SelectCharacter(radioGroupIndex)
{
gIndex = radioGroupIndex;
SetElementEnabledById("SepCharacterInput", gIndex == gOtherIndex);
SetElementEnabledById("CollapseSpaces", gIndex == gSpaceIndex);
}
function onOK()
@ -129,7 +128,8 @@ function onOK()
str = str.replace(/(<br>)+$/, "");
// Reduce multiple internal <br> to just 1
str = str.replace(/(<br>)+/g, "<br>");
// TODO: Maybe add a checkbox to let user decide
//str = str.replace(/(<br>)+/g, "<br>");
// Trim leading and trailing spaces
str = str.replace(/^\s+|\s+$/, "");
@ -209,9 +209,6 @@ function onOK()
if (dialog.deleteSepCharacter.checked)
{
replaceString = "";
// Replace one or more adjacent spaces
if (sepCharacter == " ")
sepCharacter += "\+";
}
else
{
@ -219,11 +216,26 @@ function onOK()
// so include it at start of string to replace
replaceString = sepCharacter;
}
replaceString += "<td>";
if (sepCharacter.length > 0)
{
var pattern = new RegExp("\\" + sepCharacter, "g");
var tempStr = sepCharacter;
var regExpChars = ".!@#$%^&*-+[]{}\\\/";
if (regExpChars.indexOf(sepCharacter) >= 0)
tempStr = "\\" + sepCharacter;
if (gIndex == gSpaceIndex)
{
// If checkbox is checked,
// one or more adjacent spaces are one separator
if (dialog.collapseSpaces.checked)
tempStr = "\\s+"
else
tempStr = "\\s";
}
var pattern = new RegExp(tempStr, "g");
str = str.replace(pattern, replaceString);
}
@ -310,7 +322,6 @@ function onOK()
if (node2.nodeName.toLowerCase() == "td" ||
node2.nodeName.toLowerCase() == "th")
{
cellNode = node2;
editorShell.editorSelection.collapse(node2, 0);
break;
}

15
editor/ui/dialogs/content/EdConvertToTable.xul
View File

@ -49,16 +49,21 @@
<popupset id="aTooltipSet"/>
<html flex="1">&instructions.label;</html>
<radiogroup id="SepRadioGroup" orient="vertical" persist="index character" index="0" character="">
<radio group="SepRadioGroup" id="comma" label="&commaRadio.label;" oncommand="SelectCharacter('0');"/>
<radio group="SepRadioGroup" id="space" label="&spaceRadio.label;" oncommand="SelectCharacter('1');"/>
<radio group="SepRadioGroup" id="comma" label="&commaRadio.label;" oncommand="SelectCharacter('0');"/>
<vbox>
<radio group="SepRadioGroup" id="space" label="&spaceRadio.label;" oncommand="SelectCharacter('1');"/>
<checkbox id="CollapseSpaces" label="&collapseSpaces.label;"
style="margin-left:2em" checked="true" persist="checked"
tooltip="aTooltip" tooltiptext="&collapseSpaces.tooltip;"/>
</vbox>
<hbox autostretch="never">
<radio group="SepRadioGroup" id="other" label="&otherRadio.label;" oncommand="SelectCharacter('2');"/>
<radio group="SepRadioGroup" id="other" label="&otherRadio.label;" oncommand="SelectCharacter('2');"/>
<textbox class="narrow" id="SepCharacterInput" oninput="InputSepCharacter()"/>
</hbox>
</radiogroup>
<spring class="spacer"/>
<checkbox id="DeleteSepCharacter" label="&deleteCharCheck.label;" oncommand="SelectCharacter('1');"/>
<checkbox id="DeleteSepCharacter" label="&deleteCharCheck.label;" checked="true" persist="checked"/>
<separator class="groove"/>
<!-- from global dialogOverlay -->
<hbox id="okCancelButtons"/>
<hbox id="okCancelButtonsRight"/>
</window>

5
editor/ui/dialogs/locale/en-US/EdConvertToTable.dtd
View File

@ -29,6 +29,5 @@
<!ENTITY spaceRadio.label "Space">
<!ENTITY otherRadio.label "Other Character:">
<!ENTITY deleteCharCheck.label "Delete separator character">
<!ENTITY collapseSpaces.label "Ignore extra spaces">
<!ENTITY collapseSpaces.tooltip "Convert adjacent spaces to one separator">