Changeset 217

Timestamp:

2007-03-16 17:49:45 (22 months ago)

Author:

fredck

Message:

Fixed #254 : The IgnoreEmptyParagraphValue setting is now correctly handled in Firefox.
Also, some lines have been moved to their right place.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fck.js (modified) (8 diffs)
• editor/_source/internals/fckregexlib.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/internals/fck.js

@@ -89 +89 @@
                 this.EditingArea = new FCKEditingArea( document.getElementById( 'xEditingArea' ) ) ;
                 this.EditingArea.FFSpellChecker = false ;
-                
+
                 // Final setup of the lists lib.
                 FCKListsLib.Setup() ;
@@ -207 +207 @@
 
                 if ( FCKConfig.FullPage )
+                {
                         sXHTML = FCKXHtml.GetXHTML( oDoc.getElementsByTagName( 'html' )[0], true, format ) ;
+
+                        if ( FCK.DocTypeDeclaration && FCK.DocTypeDeclaration.length > 0 )
+                                sXHTML = FCK.DocTypeDeclaration + '\n' + sXHTML ;
+
+                        if ( FCK.XmlDeclaration && FCK.XmlDeclaration.length > 0 )
+                                sXHTML = FCK.XmlDeclaration + '\n' + sXHTML ;
+                }
                 else
                 {
-                        if ( FCKConfig.IgnoreEmptyParagraphValue && oDoc.body.innerHTML == '<P>&nbsp;</P>' )
+                        sXHTML = FCKXHtml.GetXHTML( oDoc.body, false, format ) ;
+
+                        if ( FCKConfig.IgnoreEmptyParagraphValue && FCKRegexLib.EmptyOutParagraph.test( sXHTML ) )
                                 sXHTML = '' ;
-                        else
-                                sXHTML = FCKXHtml.GetXHTML( oDoc.body, false, format ) ;
                 }
 
@@ -221 +229 @@
                 if ( FCKBrowserInfo.IsIE )
                         sXHTML = sXHTML.replace( FCKRegexLib.ToReplace, '$1' ) ;
-
-                if ( FCK.DocTypeDeclaration && FCK.DocTypeDeclaration.length > 0 )
-                        sXHTML = FCK.DocTypeDeclaration + '\n' + sXHTML ;
-
-                if ( FCK.XmlDeclaration && FCK.XmlDeclaration.length > 0 )
-                        sXHTML = FCK.XmlDeclaration + '\n' + sXHTML ;
 
                 return FCKConfig.ProtectedSource.Revert( sXHTML ) ;
@@ -315 +317 @@
                 {
                         html = FCKConfig.ProtectedSource.Protect( html ) ;
-                        
+
                         // Fix for invalid self-closing tags (see #152).
                         html = html.replace( FCKRegexLib.InvalidSelfCloseTags, '$1></$2>' ) ;
-                        
+
                         html = FCK.ProtectEvents( html ) ;
                         html = FCK.ProtectUrls( html ) ;
@@ -332 +334 @@
                                 html = html.replace( FCKRegexLib.EmCloser, '<\/i>' ) ;
                         }
-                        
+
                         this._ForceResetIsDirty = ( resetIsDirty === true ) ;
 
@@ -430 +432 @@
                         // Removes the enter key handler.
                         FCK.EnterKeyHandler = null ;
-                        
+
                         if ( resetIsDirty )
                                 this.ResetIsDirty() ;
@@ -570 +572 @@
 
                 FCK.SetHTML( sHtml, !bIsDirty ) ;
-                
+
                 // Set the Focus.
                 FCK.Focus() ;
@@ -644 +646 @@
         // Listen for keystroke events.
         FCK.KeystrokeHandler.AttachToElement( FCK.EditorDocument ) ;
-        
+
         if ( FCK._ForceResetIsDirty )
                 FCK.ResetIsDirty() ;
-        
+
         // This is a tricky thing for IE. In some cases, even if the cursor is
         // blinking in the editing, the keystroke handler doesn't catch keyboard

FCKeditor/trunk/editor/_source/internals/fckregexlib.js

@@ -60 +60 @@
 
 // Empty elements may be <p></p> or even a simple opening <p> (see #211).
-EmptyParagraph  : /^<([^ >]+)[^>]*>\s*(<\/\1>)?$/i ,
+EmptyParagraph  : /^<([^ >]+)[^>]*>\s*(<\/\1>)?$/ ,
+
+EmptyOutParagraph : /^<([^ >]+)[^>]*>(?:\s*|&nbsp;)(<\/\1>)?$/ ,
 
 TagBody                 : /></ ,

FCKeditor/trunk/_whatsnew.html

@@ -117 +117 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/190">#190</a>] Toolbars
                         may be wrongly positioned. Fixed.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/254">#254</a>] The IgnoreEmptyParagraphValue
+                        setting is now correctly handled in Firefox.</li>
         </ul>
         <h3>