Changeset 4178

Timestamp:

09/02/09 14:34:21 (4 years ago)

Author:

tobiasz.cudnik

Message:

Fixed #3633 - Default context menu isn't disabled in toolbar, status bar, panels.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/contextmenu/plugin.js (modified) (2 diffs)
• _source/plugins/panel/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -59 +59 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3978">#3978</a> : Fixed setStyle float on IE7 strict.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4262">#4262</a> : Tab and Shift+Tab was not working to cycle through CTRL+SHIFT+F10 context menu in IE.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/3633">#3633</a> : Default context menu isn't disabled in toolbar, status bar, panels...</li>
         </ul>
         <h3>

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 );
+                                } );
         },
 
@@ -148 +155 @@
                 },
 
+                addDisabledTarget : function( element )
+                {
+                        element.on( 'contextmenu', function( event )
+                                {
+                                        // Cancel the browser context menu.
+                                        event.data.preventDefault();
+                                } );
+                },
+
                 addListener : function( listenerFn )
                 {

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

@@ -254 +254 @@
 
                 this._.focusIndex = -1;
+
+                // Disable context menu for panels.
+                if ( CKEDITOR.plugins.contextMenu )
+                        CKEDITOR.plugins.contextMenu.prototype.addDisabledTarget( this.element );
         },