Changeset 2221

Timestamp:

2008-07-15 09:08:23 (20 months ago)

Author:

martinkou

Message:

Fixed #2252 : It's now possible to enable the browsers default menu using the configuration file (FCKConfig.BrowserContextMenu option).

Location:

FCKeditor/trunk

Files:

• editor/_source/classes/fckcontextmenu.js (modified) (4 diffs)
• fckconfig.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/classes/fckcontextmenu.js

@@ -91 +91 @@
 function FCKContextMenu_Document_OnContextMenu( e )
 {
+        if ( FCKConfig.BrowserContextMenu )
+                return true ;
+
         var el = e.target ;
 
@@ -115 +118 @@
         if( !e || e.button != 2 )
                 return false ;
+
+        if ( FCKConfig.BrowserContextMenu )
+                return true ;
 
         var el = e.target ;
@@ -147 +153 @@
 function FCKContextMenu_Document_OnMouseUp( e )
 {
+        if ( FCKConfig.BrowserContextMenu )
+                return true ;
+
         var overrideButton = FCKContextMenu_OverrideButton ;
 
@@ -166 +175 @@
 function FCKContextMenu_AttachedElement_OnContextMenu( ev, fckContextMenu, el )
 {
-        if ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) )
+        if ( ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) ) || FCKConfig.BrowserContextMenu )
                 return true ;
 

FCKeditor/trunk/fckconfig.js

@@ -148 +148 @@
 FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form','DivContainer'] ;
 FCKConfig.BrowserContextMenuOnCtrl = false ;
+FCKConfig.BrowserContextMenu = false ;
 
 FCKConfig.EnableMoreFontColors = true ;

FCKeditor/trunk/_whatsnew.html

@@ -45 +45 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2234">#2234</a>] Added the
                         ability to create, modify and remove Div containers.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2252">#2252</a>] It's now possible to enable the
+                        browsers default menu using the configuration file (FCKConfig.BrowserContextMenu option).</li> 
         </ul>
         <p>