Ticket #1666: 1666.patch
File 1666.patch, 2.1 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
53 53 an issue in FCKTools.FixCssUrls that, other than wrong, was breaking Opera.</li> 54 54 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1695">#1695</a>] Removed 55 55 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> 56 59 </ul> 57 60 <h3> 58 61 Version 2.6 Beta 1</h3> -
editor/_source/classes/fckpanel.js
34 34 35 35 if ( FCKBrowserInfo.IsIE ) 36 36 { 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 37 45 // This is a trick to IE6 (not IE7). The original domain must be set 38 46 // before creating the popup, so we are able to take a refence to the 39 47 // document inside of it, and the set the proper domain for it. (#123) 40 48 if ( FCK_IS_CUSTOM_DOMAIN ) 49 { 50 pDoc.domain = FCK_ORIGINAL_DOMAIN ; 41 51 document.domain = FCK_ORIGINAL_DOMAIN ; 52 } 42 53 43 // Create the Popup that will hold the panel.44 this._Popup = this._Window.createPopup() ;45 54 oDocument = this.Document = this._Popup.document ; 46 55 47 56 // Set the proper domain inside the popup. 48 57 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 } 50 63 51 64 FCK.IECleanup.AddItem( this, FCKPanel_Cleanup ) ; 52 65 }