Changeset 4196

Timestamp:

09/07/09 12:21:47 (4 years ago)

Author:

tobiasz.cudnik

Message:

Fixed #4369 - Changes from #3633 needs to be located in correct place.

Location:

CKEditor/trunk/_source

Files:

• core/dom/element.js (modified) (1 diff)
• plugins/contextmenu/plugin.js (modified) (2 diffs)
• themes/default/theme.js (modified) (1 diff)

CKEditor/trunk/_source/core/dom/element.js

@@ -1381 +1381 @@
                 {
                         return this.$.childNodes.length;
-                }
+                },
+
+                disableContextMenu : function()
+                {
+                        this.on( 'contextmenu', function( event )
+                                {
+                                        // Cancel the browser context menu.
+                                        if ( !event.data.getTarget().hasClass( 'cke_enable_context_menu' ) )
+                                                event.data.preventDefault();
+                                } );
+                }
         });

CKEditor/trunk/_source/plugins/contextmenu/plugin.js

@@ -36 +36 @@
                         },
                         this);
-
-                        // Disable context menu for top and bottom editor's UI parts.
-                        var self = this;
-                        editor.on( 'themeLoaded', function()
-                                {
-                                        self.addDisabledTarget( this.container );
-                                } );
         },
 
@@ -155 +148 @@
                 },
 
-                addDisabledTarget : function( element )
-                {
-                        element.on( 'contextmenu', function( event )
-                                {
-                                        // Cancel the browser context menu.
-                                        if ( !event.data.getTarget().hasClass( 'cke_enable_context_menu' ) )
-                                                event.data.preventDefault();
-                                } );
-                },
-
                 addListener : function( listenerFn )
                 {

CKEditor/trunk/_source/themes/default/theme.js

@@ -87 +87 @@
                         editor.container = container;
 
+                        // Disable browser context menu for editor's chrome.
+                        container.disableContextMenu();
+
                         editor.fireOnce( 'themeLoaded' );
                         editor.fireOnce( 'uiReady' );