Changeset 2359

Timestamp:

2008-08-14 13:03:54 (5 months ago)

Author:

alfonsoml

Message:

fix #2333. Encode ">" in Opera and Safari

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fckxhtmlentities.js (modified) (2 diffs)
• _test/automated/tests/fckdataprocessor.html (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

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

@@ -151 +151 @@
                 //      '&':'amp',              // This entity is automatically handled by the XHTML parser.
                 //      '<':'lt',               // This entity is automatically handled by the XHTML parser.
-                //      '>':'gt',               // This entity is automatically handled by the XHTML parser.
+                        '>':'gt',                       // Opera and Safari don't encode it in their implementation
                         'ˆ':'circ',
                         '˜':'tilde',
@@ -332 +332 @@
         else
         {
-                FCKXHtmlEntities.Entities = {} ;
+                FCKXHtmlEntities.Entities = {
+                        '>':'gt' // Opera and Safari don't encode it in their implementation
+                } ;
+                sChars = '>';
 
                 // Even if we are not processing the entities, we must render the &nbsp;
                 // correctly. As we don't want HTML entities, let's use its numeric
                 // representation (&#160).
-                sChars = ' ' ;
+                sChars += ' ' ;
         }
 

FCKeditor/trunk/_test/automated/tests/fckdataprocessor.html

@@ -165 +165 @@
 }
 
+function test_ConvertToDataFormat_Character_Transform()
+{
+        var dataProcessor = new FCKDataProcessor() ;
+
+        assertEquals(
+                '<p>&lt;&lt;GetText(Edit)&gt;&gt;</p>',
+                dataProcessor.ConvertToDataFormat( document.getElementById('xDiv3'), true, true ) ) ;
+}
+
         </script>
 </head>
@@ -170 +179 @@
         <div id="xDiv1"><p>This is a <strong>test</strong>.</p><p>Another paragraph.</p></div>
         <div id="xDiv2"><p>&nbsp;</p></div>
+        <div id="xDiv3"><p>&lt;&lt;GetText(Edit)&gt;&gt;</p></div>
 </body>
 </html>

FCKeditor/trunk/_whatsnew.html

@@ -38 +38 @@
                 New Features and Improvements:</p>
         <ul>
-                <li></li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2333">#2333</a>] The &amp;gt;
+                        character inside text wasn't encoded in Opera and Safari.</li>
         </ul>
         <p>