Ticket #2036: 2036.patch

File 2036.patch, 1.3 KB (added by Martin Kou, 13 years ago)
  • _whatsnew.html

     
    5252                        colored text.</li>
    5353                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1952">#1952</a>] Fixed
    5454                        an issue in FCKTools.FixCssUrls that, other than wrong, was breaking Opera.</li>
    55 <<<<<<< .mine
    5655                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1695">#1695</a>] Removed
    5756                        Ctrl-Tab hotkey for Source mode and allowed Ctrl-T to work in Firefox.</li>
    5857                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1666">#1666</a>] Fixed
  • editor/_source/classes/fckpanel.js

     
    4545                // This is a trick to IE6 (not IE7). The original domain must be set
    4646                // before creating the popup, so we are able to take a refence to the
    4747                // document inside of it, and the set the proper domain for it. (#123)
    48                 if ( FCK_IS_CUSTOM_DOMAIN )
     48                if ( FCK_IS_CUSTOM_DOMAIN && !FCKBrowserInfo.IsIE7 )
    4949                {
    5050                        pDoc.domain = FCK_ORIGINAL_DOMAIN ;
    5151                        document.domain = FCK_ORIGINAL_DOMAIN ;
© 2003 – 2020 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy