Changeset 1686

Show
Ignore:
Timestamp:
2008-03-10 03:27:42 (4 months ago)
Author:
martinkou
Message:

Fixed #1666 : Fixed permission denied errors during opening popup menus in IE6 under domain relaxation mode.

Location:
FCKeditor/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • FCKeditor/trunk/editor/_source/classes/fckpanel.js

    r1596 r1686  
    3535        if ( FCKBrowserInfo.IsIE ) 
    3636        { 
     37                // Create the Popup that will hold the panel. 
     38                // The popup has to be created before playing with domain hacks, see #1666. 
     39                this._Popup     = this._Window.createPopup() ; 
     40 
     41                // this._Window cannot be accessed while playing with domain hacks, but local variable is ok. 
     42                // See #1666. 
     43                var pDoc = this._Window.document ; 
     44 
    3745                // This is a trick to IE6 (not IE7). The original domain must be set 
    3846                // before creating the popup, so we are able to take a refence to the 
    3947                // document inside of it, and the set the proper domain for it. (#123) 
    4048                if ( FCK_IS_CUSTOM_DOMAIN ) 
     49                { 
     50                        pDoc.domain = FCK_ORIGINAL_DOMAIN ; 
    4151                        document.domain = FCK_ORIGINAL_DOMAIN ; 
    42  
    43                 // Create the Popup that will hold the panel. 
    44                 this._Popup     = this._Window.createPopup() ; 
     52                } 
     53 
    4554                oDocument = this.Document = this._Popup.document ; 
    4655 
    4756                // Set the proper domain inside the popup. 
    4857                if ( FCK_IS_CUSTOM_DOMAIN ) 
    49                         document.domain = oDocument.domain = FCK_RUNTIME_DOMAIN ; 
     58                { 
     59                        oDocument.domain = FCK_RUNTIME_DOMAIN ; 
     60                        pDoc.domain = FCK_RUNTIME_DOMAIN ; 
     61                        document.domain = FCK_RUNTIME_DOMAIN ; 
     62                } 
    5063 
    5164                FCK.IECleanup.AddItem( this, FCKPanel_Cleanup ) ; 
  • FCKeditor/trunk/_whatsnew.html

    r1684 r1686  
    5454                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1695">#1695</a>] Removed 
    5555                        Ctrl-Tab hotkey for Source mode and allowed Ctrl-T to work in Firefox.</li> 
     56                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1666">#1666</a>] Fixed  
     57                        permission denied errors during opening popup menus in IE6 under domain relaxation 
     58                        mode.</li> 
    5659        </ul> 
    5760        <h3>