Ticket #2018: 2018_3.patch

File 2018_3.patch, 2.4 KB (added by Martin Kou, 11 years ago)
  • _whatsnew.html

     
    4646        <ul>
    4747                <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
    4848                        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>
    4953        </ul>
    5054        <p>
    5155        </p>
  • editor/_source/classes/fckiecleanup.js

     
    4343
    4444function FCKIECleanup_Cleanup()
    4545{
    46         if ( !this._FCKCleanupObj || !window.FCKUnloadFlag )
     46        if ( !this._FCKCleanupObj || ( FCKConfig.MsWebBrowserControlCompat && !window.FCKUnloadFlag ) )
    4747                return ;
    4848
    4949        var aItems = this._FCKCleanupObj.Items ;
  • editor/_source/fckeditorapi.js

     
    164164
    165165function FCKeditorAPI_Cleanup()
    166166{
    167         if ( ! window.FCKUnloadFlag )
     167        if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat
     168                        && !window.FCKUnloadFlag )
    168169                return ;
    169170        delete FCKeditorAPI.Instances[ FCK.Name ] ;
    170171}
    171172function FCKeditorAPI_ConfirmCleanup()
    172173{
    173         window.FCKUnloadFlag = true ;
     174        if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat )
     175                window.FCKUnloadFlag = true ;
    174176}
    175177FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;
    176178FCKTools.AddEventListener( window, 'beforeunload', FCKeditorAPI_ConfirmCleanup) ;
  • fckconfig.js

     
    314314
    315315FCKConfig.BackgroundBlockerColor = '#ffffff' ;
    316316FCKConfig.BackgroundBlockerOpacity = 0.50 ;
     317
     318FCKConfig.MsWebBrowserControlCompat = false ;
© 2003 – 2019 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy