Ticket #3373: 3373_3.patch

_source/plugins/contextmenu/plugin.js

@@ -39 +39 @@
 
         _ :
         {
+                getMenuItems : function()
+                {
+                        var items = [];
+
+                        var selection = this.editor.getSelection(),
+                                element = selection && selection.getStartElement();
+
+                        for ( var i = 0 ; i < this._.listeners.length ; i++ )
+                        {
+                                var listenerItems = this._.listeners[ i ]( element, selection );
+
+                                if ( listenerItems )
+                                {
+                                        for ( var itemName in listenerItems )
+                                        {
+                                                var item = this.editor.getMenuItem( itemName );
+
+                                                if ( item )
+                                                {
+                                                        item.state = listenerItems[ itemName ];
+                                                        items.push( item );
+                                                }
+                                        }
+                                }
+                        }
+                        return items;
+                },
+                
                 onMenu : function( offsetParent, offsetX, offsetY )
                 {
                         var menu = this._.menu,
@@ -79 +107 @@
                                 };
                         }
 
-                        var listeners = this._.listeners,
-                                includedItems = [];
-
-                        var selection = this.editor.getSelection(),
-                                element = selection && selection.getStartElement();
-
                         // Lock the selection in IE, so it can be restored when closing the
                         // menu.
                         if ( CKEDITOR.env.ie )
                         {
-                                selection.lock();
+                                editor.getSelection().lock()
                                 menu.onHide = function()
                                 {
                                         editor.getSelection().unlock();
                                 };
                         }
 
-                        // Call all listeners, filling the list of items to be displayed.
-                        for ( var i = 0 ; i < listeners.length ; i++ )
+                        var items = this._.getMenuItems();
+
+                        for ( var i = 0 ; i < items.length ; i++ )
                         {
-                                var listenerItems = listeners[ i ]( element, selection );
-
-                                if ( listenerItems )
-                                {
-                                        for ( var itemName in listenerItems )
-                                        {
-                                                var item = this.editor.getMenuItem( itemName );
-
-                                                if ( item )
-                                                {
-                                                        item.state = listenerItems[ itemName ];
-                                                        menu.add( item );
-                                                }
-                                        }
-                                }
+                                menu.add( items[i] );
                         }
 
                         menu.show( offsetParent, editor.lang.dir == 'rtl' ? 2 : 1, offsetX, offsetY );
@@ -128 +137 @@
                                 {
                                         var domEvent = event.data;
 
+                                        // Don't show our context menu if there are no menu items.
+                                        var items = this._.getMenuItems();
+                                        if ( items.length === 0 )
+                                                return;
+
                                         // Cancel the browser context menu.
                                         domEvent.preventDefault();