Ticket #2018: 2018.patch
File 2018.patch, 2.8 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
120 120 when FCKeditor is installed to a different domain.</li> 121 121 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2066">#2066</a>] Added a workaround for a Mac 122 122 Safari 3.1 browser bug which caused the Fit Window button to give a blank screen.</li> 123 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2018">#2018</a>] Reversed the fix for 124 <a target="_blank" href="http://dev.fckeditor.net/ticket/183">#183</a> which broke FCKeditorAPI's cleanup 125 logic. A new configuration directive <strong>MsWebBrowserControlOnUnloadKludge</strong> has been added 126 for those who wish to force the #183 fix to be enabled.</li> 123 127 </ul> 124 128 <h3> 125 129 Version 2.6</h3> -
editor/_source/classes/fckiecleanup.js
43 43 44 44 function FCKIECleanup_Cleanup() 45 45 { 46 if ( !this._FCKCleanupObj || !window.FCKUnloadFlag)46 if ( !this._FCKCleanupObj || ( FCKConfig.MsWebBrowserControlOnUnloadKludge && !window.FCKUnloadFlag ) ) 47 47 return ; 48 48 49 49 var aItems = this._FCKCleanupObj.Items ; -
editor/_source/fckeditorapi.js
164 164 165 165 function FCKeditorAPI_Cleanup() 166 166 { 167 if ( ! window.FCKUnloadFlag ) 167 alert( FCKConfig.MsWebBrowserControlOnUnloadKludge ) ; 168 if ( window.FCKConfig && FCKConfig.MsWebBrowserControlOnUnloadKludge 169 && !window.FCKUnloadFlag ) 168 170 return ; 169 171 delete FCKeditorAPI.Instances[ FCK.Name ] ; 170 172 } 171 173 function FCKeditorAPI_ConfirmCleanup() 172 174 { 173 window.FCKUnloadFlag = true ; 175 if ( window.FCKConfig && FCKConfig.MsWebBrowserControlOnUnloadKludge ) 176 window.FCKUnloadFlag = true ; 174 177 } 175 178 FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ; 176 179 FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ; -
fckconfig.js
314 314 315 315 FCKConfig.BackgroundBlockerColor = '#ffffff' ; 316 316 FCKConfig.BackgroundBlockerOpacity = 0.50 ; 317 318 // Enable the follow option to prevent FCKeditor from unloading itself 319 // when viewed under a WebBrowser control inside an application. 320 // NOT RECOMMENDED for normal websites as it causes other problems. 321 FCKConfig.MsWebBrowserControlOnUnloadKludge = false ;