Ticket #1150: 1150.patch

_whatsnew.html

@@ -122 +122 @@
                         Safari 3.1 browser bug which caused the Fit Window button to give a blank screen.</li> 
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2218">#2218</a>] Improved Gecko based browser
                         detection to accept Epiphany/Gecko as well.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1150">#1150</a>] Fixed the type="_moz" attribute
+                        that sometimes appear in &lt;br&gt; tags in non-IE browsers.</li>
         </ul>
         <h3>
                 Version 2.6</h3>

editor/_source/internals/fckxhtml.js

@@ -204 +204 @@
 
                         // Ignore bogus BR nodes in the DOM.
                         if ( FCKBrowserInfo.IsGecko &&
-                                        htmlNode.nextSibling &&
                                         ( htmlNode.hasAttribute('_moz_editor_bogus_node') || htmlNode.getAttribute( 'type' ) == '_moz' ) )
-                                return false ;
+                        {
+                                if ( htmlNode.nextSibling )
+                                        return false ;
+                                else
+                                {
+                                        htmlNode.removeAttribute( '_moz_editor_bogus_node' ) ;
+                                        htmlNode.removeAttribute( 'type' ) ;
+                                }
+                        }
 
                         // This is for elements that are instrumental to FCKeditor and
                         // must be removed from the final HTML.