Index: EdFieldSetProps.js
===================================================================
RCS file: /cvsroot/mozilla/editor/ui/dialogs/content/EdFieldSetProps.js,v
retrieving revision 1.1
diff -u -r1.1 EdFieldSetProps.js
--- EdFieldSetProps.js 2002/01/15 15:49:37 1.1
+++ EdFieldSetProps.js 2002/01/23 13:26:43
@@ -165,11 +165,6 @@
editorShell.BeginBatchChanges();
try {
- editorShell.CloneAttributes(legendElement, globalElement);
-
- if (insertNew)
- InsertElementAroundSelection(fieldsetElement);
-
if (gDialog.editText.checked)
{
if (gDialog.legendText.value)
@@ -179,11 +174,18 @@
editorShell.InsertElement(legendElement, fieldsetElement, 0, true);
else while (legendElement.firstChild)
editor.DeleteNode(legendElement.firstChild);
- editor.InsertNode(document.createTextNode(gDialog.legendText.value), legendElement, 0);
+ editor.InsertNode(editorShell.editorDocument.createTextNode(gDialog.legendText.value), legendElement, 0);
}
else if (!newLegend)
editorShell.DeleteElement(legendElement);
}
+
+ if (insertNew)
+ InsertElementAroundSelection(fieldsetElement);
+ else
+ editorShell.SelectElement(fieldsetElement);
+
+ editorShell.CloneAttributes(legendElement, globalElement);
}
finally {
editorShell.EndBatchChanges();
Index: EdLabelProps.js
===================================================================
RCS file: /cvsroot/mozilla/editor/ui/dialogs/content/EdLabelProps.js,v
retrieving revision 1.1
diff -u -r1.1 EdLabelProps.js
--- EdLabelProps.js 2002/01/15 15:49:41 1.1
+++ EdLabelProps.js 2002/01/23 13:26:44
@@ -119,8 +119,11 @@
var editor = editorShell.editor;
while (labelElement.firstChild)
editor.DeleteNode(labelElement.firstChild);
- if (gDialog.labelText.value)
- editor.InsertNode(document.createTextNode(gDialog.labelText.value), labelElement, 0);
+ if (gDialog.labelText.value) {
+ var textNode = editorShell.editorDocument.createTextNode(gDialog.labelText.value);
+ editor.InsertNode(textNode, labelElement, 0);
+ editorShell.SelectElement(labelElement);
+ }
}
editorShell.EndBatchChanges();
Index: EdTextAreaProps.js
===================================================================
RCS file: /cvsroot/mozilla/editor/ui/dialogs/content/EdTextAreaProps.js,v
retrieving revision 1.1
diff -u -r1.1 EdTextAreaProps.js
--- EdTextAreaProps.js 2002/01/15 15:49:42 1.1
+++ EdTextAreaProps.js 2002/01/23 13:26:44
@@ -63,9 +63,12 @@
var tagName = "textarea";
textareaElement = editorShell.GetSelectedElement(tagName);
- if (textareaElement)
+ if (textareaElement) {
// We found an element and don't need to insert one
insertNew = false;
+
+ gDialog.textareaValue.value = textareaElement.value;
+ }
else
{
insertNew = true;
@@ -81,7 +84,7 @@
return;
}
else
- textareaElement.value = GetSelectionAsText();
+ gDialog.textareaValue.value = GetSelectionAsText();
}
// Make a copy to use for AdvancedEdit
@@ -91,13 +94,6 @@
InitMoreFewer();
- if ("@mozilla.org/preferences;1" in Components.classes) try {
- var pref = Components.classes["@mozilla.org/preferences;1"];
- pref = pref.getService(Components.interfaces.nsIPref);
- var wrap = document.getElementById("wrap");
- wrap.setAttribute("collapsed", pref.GetBoolPref("editor.dtd.strict"));
- } catch (e) {}
-
SetTextboxFocus(gDialog.textareaName);
SetWindowLocation();
@@ -108,12 +104,11 @@
gDialog.textareaName.value = globalElement.getAttribute("name");
gDialog.textareaRows.value = globalElement.getAttribute("rows");
gDialog.textareaCols.value = globalElement.getAttribute("cols");
- gDialog.textareaWrap.value = globalElement.getAttribute("wrap");
+ gDialog.textareaWrap.value = GetHTMLOrCSSStyleValue(globalElement, "wrap", "white-space");
gDialog.textareaReadOnly.checked = globalElement.hasAttribute("readonly");
gDialog.textareaDisabled.checked = globalElement.hasAttribute("disabled");
gDialog.textareaTabIndex.value = globalElement.getAttribute("tabindex");
gDialog.textareaAccessKey.value = globalElement.getAttribute("accesskey");
- gDialog.textareaValue.value = globalElement.value;
onInput();
}
@@ -152,32 +147,38 @@
else
globalElement.removeAttribute(f);
}
- globalElement.value = gDialog.textareaValue.value;
return true;
}
function onAccept()
{
- editorShell.BeginBatchChanges();
-
- if (insertNew)
- {
- try {
- // 'true' means delete the selection before inserting
- // in case were are converting text to a text area
- editorShell.InsertElementAtSelection(textareaElement, true);
- } catch (e) {
- dump(e);
- }
- }
-
// All values are valid - copy to actual element in doc or
// element created to insert
ValidateData();
+
+ editorShell.BeginBatchChanges();
+
+ try {
+ // undoably set value
+ var initialText = gDialog.textareaValue.value;
+ if (initialText != textareaElement.value) {
+ while (textareaElement.hasChildNodes())
+ editorShell.editor.DeleteNode(textareaElement.firstChild);
+ if (initialText) {
+ var textNode = editorShell.editorDocument.createTextNode(initialText);
+ editorShell.editor.InsertNode(textNode, textareaElement, 0);
+ }
+ }
- editorShell.CloneAttributes(textareaElement, globalElement);
+ if (insertNew)
+ editorShell.InsertElementAtSelection(textareaElement, true);
+ else
+ editorShell.SelectElement(textareaElement);
- editorShell.EndBatchChanges();
+ editorShell.CloneAttributes(textareaElement, globalElement);
+ } finally {
+ editorShell.EndBatchChanges();
+ }
SaveWindowLocation();
Index: EdTextAreaProps.xul
===================================================================
RCS file: /cvsroot/mozilla/editor/ui/dialogs/content/EdTextAreaProps.xul,v
retrieving revision 1.1
diff -u -r1.1 EdTextAreaProps.xul
--- EdTextAreaProps.xul 2002/01/15 15:49:42 1.1
+++ EdTextAreaProps.xul 2002/01/23 13:26:45
@@ -88,50 +88,56 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+