Fixed bug #13008: htmlArea RTE: Ending a list may produce invalid xhtml in Safari...
authorStanislas Rolland <typo3@sjbr.ca>
Fri, 11 Dec 2009 03:23:21 +0000 (03:23 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Fri, 11 Dec 2009 03:23:21 +0000 (03:23 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6653 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js

index 43a428e..e01efa3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Fixed bug #13004: htmlArea RTE: buttons.table.disableEnterParagraphs not honoured in Opera
        * Fixed bug #13007: htmlArea RTE: Toggling insertlist buttons may freeze Safari/Chrome browsers
+       * Fixed bug #13008: htmlArea RTE: Ending a list may produce invalid xhtml in Safari/Chrome
 
 2009-12-10  Dmitry Dulepov  <dmitry.dulepov@gmail.com>
 
index c7465fc..717df05 100644 (file)
@@ -2,6 +2,7 @@
 
        * Fixed bug #13004: htmlArea RTE: buttons.table.disableEnterParagraphs not honoured in Opera
        * Fixed bug #13007: htmlArea RTE: Toggling insertlist buttons may freeze Safari/Chrome browsers
+       * Fixed bug #13008: htmlArea RTE: Ending a list may produce invalid xhtml in Safari/Chrome
 
 2009-12-09  Stanislas Rolland  <typo3@sjbr.ca>
 
index b2ad36f..cd9f9cb 100644 (file)
@@ -695,7 +695,7 @@ HTMLArea.prototype._checkInsertP = function() {
                                        left.removeChild(block);
                                        range.setEndAfter(left);
                                        range.collapse(false);
-                                       p = this.convertNode(p, /^(li|dd|td|th)$/i.test(left.parentNode.nodeName) ? "br" : "p");
+                                       p = this.convertNode(p, /^(li|dd|td|th|p|h[1-6])$/i.test(left.parentNode.nodeName) ? "br" : "p");
                                }
                        }
                        range.insertNode(df);