Ticket #309: 309_2.patch

_whatsnew.html

@@ -47 +47 @@
                         several "strict warning" messages in Firefox when running FCKeditor.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1522">#1522</a>] The ENTER
                         key will now work properly in IE with the cursor at the start of a formatted block.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/309">#309</a>] The 
+                        ENTER key will not anymore break &lt;button&gt; elements at the beginning of 
+                        paragraphs.</li>
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a>

editor/_source/classes/fckdomrange.js

@@ -151 +151 @@
         {
                 var child ;
 
-                while ( ( child = targetElement.firstChild ) && child.nodeType == 1 && FCKListsLib.EmptyElements[ child.nodeName.toLowerCase() ] == null )
+                while ( ( child = targetElement.firstChild ) && child.nodeType == 1 && FCKListsLib.InlineNonEmptyElements[ child.nodeName.toLowerCase() ] )
                         targetElement = child ;
 
                 this.MoveToElementStart( targetElement ) ;