From: Stanislas Rolland <typo3@sjbr.ca>
Date: Mon, 26 Jan 2009 16:27:45 +0000 (+0000)
Subject: Fixed bug #9905: htmlArea RTE: Table properties: Removing headers leaves an empty... 
X-Git-Tag: TYPO3_4-3-0alpha2~230
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/b80b336dd8daca4574715c4c2c17bcc9b93697d5

Fixed bug #9905: htmlArea RTE: Table properties: Removing headers leaves an empty fieldset

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4863 709f56b5-9817-0410-a4d7-c38de5d9e867
---

diff --git a/ChangeLog b/ChangeLog
index 0394fe7cd059..587468237fac 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Added feature #10182: htmlArea RTE: Add support for editing lang attribute
 	* Fixed bug #9904: htmlArea RTE: RTE.default.buttons.table.properties.borderStyle.removeItems is not honored
+	* Fixed bug #9905: htmlArea RTE: Table properties: Removing headers leaves an empty fieldset
 
 2009-01-24  Ingmar Schlecht  <ingmar@typo3.org>
 
diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 52a690c536cd..fddda18c2492 100644
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Added feature #10182: htmlArea RTE: Add support for editing lang attribute
 	* Fixed bug #9904: htmlArea RTE: RTE.default.buttons.table.properties.borderStyle.removeItems is not honored
+	* Fixed bug #9905: htmlArea RTE: Table properties: Removing headers leaves an empty fieldset
 
 2009-01-21  Stanislas Rolland  <typo3@sjbr.ca>
 
diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js
index a56d5ea8c4e8..ffcbd840e6b2 100644
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js
@@ -1517,42 +1517,44 @@ TableOperations = HTMLArea.Plugin.extend({
 	 * @return	void
 	 */
 	buildSizeAndHeadersFieldset : function (doc, table, content, fieldsetClass) {
-		var fieldset = doc.createElement("fieldset");
-		if (fieldsetClass) fieldset.className = fieldsetClass;
-		if (!table) {
-			TableOperations.insertLegend(doc, fieldset, "Size and Headers");
-			TableOperations.buildInput(doc, fieldset, "f_rows", "Rows:", "Number of rows", "", "5", ((this.properties && this.properties.numberOfRows && this.properties.numberOfRows.defaultValue) ? this.properties.numberOfRows.defaultValue : "2"), "fr");
-			TableOperations.insertSpace(doc, fieldset);
-			TableOperations.buildInput(doc, fieldset, "f_cols", "Cols:", "Number of columns", "", "5", ((this.properties && this.properties.numberOfColumns && this.properties.numberOfColumns.defaultValue) ? this.properties.numberOfColumns.defaultValue : "4"), "fr");
-		} else {
-			TableOperations.insertLegend(doc, fieldset, "Headers");
-		}
-		if (this.removedProperties.indexOf("headers") == -1) {
-			var ul = doc.createElement("ul");
-			fieldset.appendChild(ul);
-			var li = doc.createElement("li");
-			ul.appendChild(li);
+		if (!table || this.removedProperties.indexOf("headers") == -1) {
+			var fieldset = doc.createElement("fieldset");
+			if (fieldsetClass) fieldset.className = fieldsetClass;
 			if (!table) {
-				var selected = (this.properties && this.properties.headers && this.properties.headers.defaultValue) ? this.properties.headers.defaultValue : "top";
+				TableOperations.insertLegend(doc, fieldset, "Size and Headers");
+				TableOperations.buildInput(doc, fieldset, "f_rows", "Rows:", "Number of rows", "", "5", ((this.properties && this.properties.numberOfRows && this.properties.numberOfRows.defaultValue) ? this.properties.numberOfRows.defaultValue : "2"), "fr");
+				TableOperations.insertSpace(doc, fieldset);
+				TableOperations.buildInput(doc, fieldset, "f_cols", "Cols:", "Number of columns", "", "5", ((this.properties && this.properties.numberOfColumns && this.properties.numberOfColumns.defaultValue) ? this.properties.numberOfColumns.defaultValue : "4"), "fr");
 			} else {
-				var selected = "none";
-				var thead = table.getElementsByTagName("thead");
-				var tbody = table.getElementsByTagName("tbody");
-				if (thead.length && thead[0].rows.length) {
-					selected = "top";
-				} else if (tbody.length && tbody[0].rows.length) {
-					if (HTMLArea._hasClass(tbody[0].rows[0], this.useHeaderClass)) {
-						selected = "both";
-					} else if (tbody[0].rows[0].cells.length && tbody[0].rows[0].cells[0].nodeName.toLowerCase() == "th") {
-						selected = "left";
+				TableOperations.insertLegend(doc, fieldset, "Headers");
+			}
+			if (this.removedProperties.indexOf("headers") == -1) {
+				var ul = doc.createElement("ul");
+				fieldset.appendChild(ul);
+				var li = doc.createElement("li");
+				ul.appendChild(li);
+				if (!table) {
+					var selected = (this.properties && this.properties.headers && this.properties.headers.defaultValue) ? this.properties.headers.defaultValue : "top";
+				} else {
+					var selected = "none";
+					var thead = table.getElementsByTagName("thead");
+					var tbody = table.getElementsByTagName("tbody");
+					if (thead.length && thead[0].rows.length) {
+						selected = "top";
+					} else if (tbody.length && tbody[0].rows.length) {
+						if (HTMLArea._hasClass(tbody[0].rows[0], this.useHeaderClass)) {
+							selected = "both";
+						} else if (tbody[0].rows[0].cells.length && tbody[0].rows[0].cells[0].nodeName.toLowerCase() == "th") {
+							selected = "left";
+						}
 					}
 				}
+				var selectHeaders = TableOperations.buildSelectField(doc, li, "f_headers", "Headers:", "fr", "floating", "Table headers", ["No header cells", "Header cells on top", "Header cells on left", "Header cells on top and left"], ["none", "top", "left", "both"],  new RegExp((selected ? selected : "top"), "i"));
+				this.removeOptions(selectHeaders, "headers");
 			}
-			var selectHeaders = TableOperations.buildSelectField(doc, li, "f_headers", "Headers:", "fr", "floating", "Table headers", ["No header cells", "Header cells on top", "Header cells on left", "Header cells on top and left"], ["none", "top", "left", "both"],  new RegExp((selected ? selected : "top"), "i"));
-			this.removeOptions(selectHeaders, "headers");
+			TableOperations.insertSpace(doc, fieldset);
+			content.appendChild(fieldset);
 		}
-		TableOperations.insertSpace(doc, fieldset);
-		content.appendChild(fieldset);
 	},
 	
 	buildLayoutFieldset : function(doc, el, content, fieldsetClass) {