Ticket #957: 957_2.patch

File 957_2.patch, 2.0 KB (added by Martin Kou, 12 years ago)
  • _whatsnew.html

     
    145145                        the FCKeditor class is now more PHP5/6 friendly ("public" keyword is used instead
    146146                        of depreciated "var").</li>
    147147                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1815">#1815</a>] PHP integration:
    148                         removed closing tag: "?>", so no additional whitespace added when files are included.</li>
     148                        removed closing tag: "?&gt;", so no additional whitespace added when files are included.</li>
    149149                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1906">#1906</a>] PHP file
    150150                        browser: fixed problems with DetectHtml() function when open_basedir was set.</li>
    151151                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1871">#1871</a>] PHP file
     
    177177                        settings.</li>
    178178                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1868">#1868</a>] Links
    179179                        to file browser has been changed to avoid requests containing double dots.</li>
     180                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/957">#957</a>] Pressing Enter
     181                        or typing after a placeholder with the placeholder plugin will no longer generate
     182                        colored text.</li>
    180183        </ul>
    181184        <p>
    182185                <a href="_whatsnew_history.html">See previous versions history</a>
  • editor/_source/internals/fck_gecko.js

     
    104104
    105105                        // only perform the patched behavior if we're in an <a> tag, or the End key is pressed.
    106106                        var parentTag = node.parentNode.tagName.toLowerCase() ;
    107                         if ( ! (  parentTag == 'a' ||
     107                        if ( ! (  parentTag == 'a' || String(node.parentNode.contentEditable) == 'false' ||
    108108                                        ( ! ( FCKListsLib.BlockElements[parentTag] || FCKListsLib.NonEmptyBlockElements[parentTag] )
    109109                                          && keyCode == 35 ) ) )
    110110                                return ;
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy