Ticket #2252: 2252_2.patch
File 2252_2.patch, 2.6 KB (added by , 16 years ago) |
---|
-
_whatsnew.html
80 80 in the Paste dialog.</li> 81 81 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1907">#1907</a>] Fixed sporadic 82 82 "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> 83 85 </ul> 84 86 <p> 85 87 <a href="_whatsnew_history.html">See previous versions history</a></p> -
editor/_source/classes/fckcontextmenu.js
90 90 91 91 function FCKContextMenu_Document_OnContextMenu( e ) 92 92 { 93 if ( FCKConfig.BrowserContextMenu ) 94 return true ; 95 93 96 var el = e.target ; 94 97 95 98 while ( el ) … … 115 118 if( !e || e.button != 2 ) 116 119 return false ; 117 120 121 if ( FCKConfig.BrowserContextMenu ) 122 return true ; 123 118 124 var el = e.target ; 119 125 120 126 while ( el ) … … 146 152 147 153 function FCKContextMenu_Document_OnMouseUp( e ) 148 154 { 155 if ( FCKConfig.BrowserContextMenu ) 156 return true ; 157 149 158 var overrideButton = FCKContextMenu_OverrideButton ; 150 159 151 160 if ( overrideButton ) … … 165 174 166 175 function FCKContextMenu_AttachedElement_OnContextMenu( ev, fckContextMenu, el ) 167 176 { 168 if ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ))177 if ( ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) ) || FCKConfig.BrowserContextMenu ) 169 178 return true ; 170 179 171 180 var eTarget = el || this ; -
fckconfig.js
147 147 148 148 FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form'] ; 149 149 FCKConfig.BrowserContextMenuOnCtrl = false ; 150 FCKConfig.BrowserContextMenu = false ; 150 151 151 152 FCKConfig.EnableMoreFontColors = true ; 152 153 FCKConfig.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' ;