Changeset 2022

Timestamp:

2008-05-28 22:17:53 (22 months ago)

Author:

alfonsoml

Message:

Fix for #2163, enable output of HTML (not XHTML) according to the DocType.

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fckregexlib.js (modified) (1 diff)
• editor/_source/internals/fckxhtml.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

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

@@ -79 +79 @@
 Html4DocType    : /HTML 4\.0 Transitional/i ,
 DocTypeTag              : /<!DOCTYPE[^>]*>/i ,
+HtmlDocType             : /DTD HTML/ ,
 
 // These regex are used to save the original event attributes in the HTML.

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

@@ -71 +71 @@
         sXHTML = sXHTML.substr( 7, sXHTML.length - 15 ).Trim() ;
 
-        // Add a space in the tags with no closing tags, like <br/> -> <br />
-        sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, ' />');
+        // According to the doctype set the proper end for self-closing tags
+        // HTML: <br>
+        // XHTML: Add a space, like <br/> -> <br />
+        if (FCKConfig.DocType.length > 0 && FCKRegexLib.HtmlDocType.test( FCKConfig.DocType ) )
+                sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, '>');
+        else
+                sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, ' />');
 
         if ( FCKConfig.ForceSimpleAmpersand )

FCKeditor/trunk/_whatsnew.html

@@ -49 +49 @@
 
                 
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2163">#2163</a>] If the FCKConfig.DocType
+                        setting points to a HTML DocType then the output won't generate self-closing tags (it will output 
+                        &lt;img &gt; instead of &lt;img /&gt;).</li>
         </ul>
         <p>