Ticket #2333: 2333.patch

File 2333.patch, 2.7 KB (added by Alfonso Martínez de Lizarrondo, 12 years ago)

Proposed patch

  • _test/automated/tests/fckdataprocessor.html

     
    164164                dataProcessor.ConvertToDataFormat( document.getElementById('xDiv2'), true, true ) ) ;
    165165}
    166166
     167function test_ConvertToDataFormat_Character_Transform()
     168{
     169        var dataProcessor = new FCKDataProcessor() ;
     170
     171        assertEquals(
     172                '<p>&lt;&lt;GetText(Edit)&gt;&gt;</p>',
     173                dataProcessor.ConvertToDataFormat( document.getElementById('xDiv3'), true, true ) ) ;
     174}
     175
    167176        </script>
    168177</head>
    169178<body>
    170179        <div id="xDiv1"><p>This is a <strong>test</strong>.</p><p>Another paragraph.</p></div>
    171180        <div id="xDiv2"><p>&nbsp;</p></div>
     181        <div id="xDiv3"><p>&lt;&lt;GetText(Edit)&gt;&gt;</p></div>
    172182</body>
    173183</html>
  • _whatsnew.html

     
    122122                        posted data page has now the table fixed at 100% width. </li>
    123123                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2396">#2396</a>] SpellerPages
    124124                        was causing a "Permission Denied" error in some situations. </li>
     125                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2333">#2333</a>] The &amp;gt;
     126                        character inside text wasn't encoded in Opera and Safari.</li>
    125127        </ul>
    126128        <p>
    127129                <a href="_whatsnew_history.html">See previous versions history</a></p>
  • editor/_source/internals/fckxhtmlentities.js

     
    150150                        '"':'quot',
    151151                //      '&':'amp',              // This entity is automatically handled by the XHTML parser.
    152152                //      '<':'lt',               // This entity is automatically handled by the XHTML parser.
    153                 //      '>':'gt',               // This entity is automatically handled by the XHTML parser.
     153                        '>':'gt',                       // Opera and Safari don't encode it in their implementation
    154154                        'ˆ':'circ',
    155155                        '˜':'tilde',
    156156                        ' ':'ensp',
     
    331331        }
    332332        else
    333333        {
    334                 FCKXHtmlEntities.Entities = {} ;
     334                FCKXHtmlEntities.Entities = {
     335                        '>':'gt' // Opera and Safari don't encode it in their implementation
     336                } ;
     337                sChars = '>';
    335338
    336339                // Even if we are not processing the entities, we must render the &nbsp;
    337340                // correctly. As we don't want HTML entities, let's use its numeric
    338341                // representation (&#160).
    339                 sChars = ' ' ;
     342                sChars += ' ' ;
    340343        }
    341344
    342345        // Create the Regex used to find entities in the text.
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy