Ticket #3053: 3053_2.patch

File 3053_2.patch, 3.0 KB (added by Alfonso Martínez de Lizarrondo, 10 years ago)

Proposed patch

  • _whatsnew.html

     
    9090                        error when trying to create link for images inside floating div containers.</li>
    9191                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3925">#3925</a>] Removed obsolete
    9292                        parentWindow reference from FCKDialog.OpenDialog().</li>
     93                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3053">#3053</a>] Fixed problems with
     94                        the height of the content area in Safari and Chrome.</li>
    9395        </ul>
    9496        <p>
    9597                <a href="_whatsnew_history.html">See previous versions history</a></p>
  • editor/_source/internals/fck.js

     
    494494                        FCK.Events.FireEvent( 'OnAfterSetHTML' ) ;
    495495                }
    496496
    497                 if ( FCKBrowserInfo.IsGecko )
     497                if ( window.onresize )
    498498                        window.onresize() ;
    499499        },
    500500
  • editor/_source/internals/fcktoolbarset.js

     
    239239        this._Document.getElementById( 'xCollapsed' ).style.display = collapse ? '' : 'none' ;
    240240        this._Document.getElementById( 'xExpanded' ).style.display = collapse ? 'none' : '' ;
    241241
    242         if ( FCKBrowserInfo.IsGecko )
     242        if ( window.onresize )
    243243        {
    244244                // I had to use "setTimeout" because Gecko was not responding in a right
    245245                // way when calling window.onresize() directly.
  • editor/fckeditor.html

     
    372372        }
    373373}
    374374
    375 // Gecko browsers doesn't calculate well the IFRAME size so we must
     375// Gecko and Webkit browsers don't calculate well the IFRAME size so we must
    376376// recalculate it every time the window size changes.
    377 if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera )
     377if ( FCKBrowserInfo.IsGecko || FCKBrowserInfo.IsSafari )
    378378{
    379379        window.onresize = function( e )
    380380        {
    381                 // Running in Chrome makes the window receive the event including subframes.
     381                // Running in Firefox's chrome makes the window receive the event including subframes.
    382382                // we care only about this window. Ticket #1642.
    383383                // #2002: The originalTarget from the event can be the current document, the window, or the editing area.
    384                 if ( e && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document ))
     384                if ( e && e.originalTarget && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document ))
    385385                        return ;
    386386
    387387                var oCell = document.getElementById( 'xEditingArea' ) ;
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy