* Fixed bug #7853: htmlArea RTE formatblock does not allow removing p or hx format...

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

diff --git a/ChangeLog b/ChangeLog
index da1e69c..adc1b3b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Fixed bug #7851: htmlArea RTE causes memory leaks in IE
        * Fixed bug #7852: JS error raised in IE7 when closing htmlArea RTE
+       * Fixed bug #7853: htmlArea RTE formatblock does not allow removing p or hx format in FF
 
 2008-03-12  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index dac94b5..7e464ef 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -2,6 +2,7 @@
 
        * Fixed bug #7851: htmlArea RTE causes memory leaks in IE
        * Fixed bug #7852: JS error raised in IE7 when closing htmlArea RTE
+       * Fixed bug #7853: htmlArea RTE formatblock does not allow removing p or hx format in FF
 
 2008-03-12  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
index 786e1bf..7285997 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
@@ -1014,9 +1014,6 @@ BlockElements = HTMLArea.Plugin.extend({
                options[0].text = this.localize("No block");
                
                if (deepestBlockAncestor) {
-                       if (!/^(body|div|address|blockquote)$/i.test(deepestBlockAncestor.nodeName) && deepestBlockAncestor.parentNode && !/^(li|td|th)$/i.test(deepestBlockAncestor.parentNode.nodeName)) {
-                               options[0].style.display = "none";
-                       }
                        var nodeName = deepestBlockAncestor.nodeName.toLowerCase();
                        for (i = options.length; --i >= 0;) {
                                if (nodeName === options[i].value.toLowerCase()) {