Ticket #2018: 2018_3.patch
File 2018_3.patch, 2.4 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
46 46 <ul> 47 47 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2248">#2248</a>] Calling FCK.InsertHtml( 'nbsp;') was inserting a plain space instead of a non breaking space 48 48 character.</li> 49 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2018">#2018</a>] Reversed the fix for 50 <a target="_blank" href="http://dev.fckeditor.net/ticket/183">#183</a> which broke FCKeditorAPI's cleanup 51 logic. A new configuration directive <strong>MsWebBrowserControlCompat</strong> has been added 52 for those who wish to force the #183 fix to be enabled.</li> 49 53 </ul> 50 54 <p> 51 55 </p> -
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.MsWebBrowserControlCompat && !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 if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat 168 && !window.FCKUnloadFlag ) 168 169 return ; 169 170 delete FCKeditorAPI.Instances[ FCK.Name ] ; 170 171 } 171 172 function FCKeditorAPI_ConfirmCleanup() 172 173 { 173 window.FCKUnloadFlag = true ; 174 if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat ) 175 window.FCKUnloadFlag = true ; 174 176 } 175 177 FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ; 176 178 FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ; -
fckconfig.js
314 314 315 315 FCKConfig.BackgroundBlockerColor = '#ffffff' ; 316 316 FCKConfig.BackgroundBlockerOpacity = 0.50 ; 317 318 FCKConfig.MsWebBrowserControlCompat = false ;