Ticket #2252: 2252_2.patch

File 2252_2.patch, 2.6 KB (added by martinkou, 6 years ago)
  • _whatsnew.html

     
    8080                        in the Paste dialog.</li> 
    8181                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1907">#1907</a>] Fixed sporadic 
    8282                        "FCKeditorAPI is not defined" errors in Firefox 3.</li> 
     83                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2252">#2252</a>] It's now possible to enable the 
     84                        browsers default menu using the configuration file (FCKConfig.BrowserContextMenu option).</li>  
    8385        </ul> 
    8486        <p> 
    8587                <a href="_whatsnew_history.html">See previous versions history</a></p> 
  • editor/_source/classes/fckcontextmenu.js

     
    9090 
    9191function FCKContextMenu_Document_OnContextMenu( e ) 
    9292{ 
     93        if ( FCKConfig.BrowserContextMenu ) 
     94                return true ; 
     95 
    9396        var el = e.target ; 
    9497 
    9598        while ( el ) 
     
    115118        if( !e || e.button != 2 ) 
    116119                return false ; 
    117120 
     121        if ( FCKConfig.BrowserContextMenu ) 
     122                return true ; 
     123 
    118124        var el = e.target ; 
    119125 
    120126        while ( el ) 
     
    146152 
    147153function FCKContextMenu_Document_OnMouseUp( e ) 
    148154{ 
     155        if ( FCKConfig.BrowserContextMenu ) 
     156                return true ; 
     157 
    149158        var overrideButton = FCKContextMenu_OverrideButton ; 
    150159 
    151160        if ( overrideButton ) 
     
    165174 
    166175function FCKContextMenu_AttachedElement_OnContextMenu( ev, fckContextMenu, el ) 
    167176{ 
    168         if ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) ) 
     177        if ( ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) ) || FCKConfig.BrowserContextMenu ) 
    169178                return true ; 
    170179 
    171180        var eTarget = el || this ; 
  • fckconfig.js

     
    147147 
    148148FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form'] ; 
    149149FCKConfig.BrowserContextMenuOnCtrl = false ; 
     150FCKConfig.BrowserContextMenu = false ; 
    150151 
    151152FCKConfig.EnableMoreFontColors = true ; 
    152153FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ; 
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy