Ticket #3380: 3380.patch

_source/plugins/elementspath/plugin.js

@@ -92 +92 @@
                                                                 ' href="javascript:void(\'', name, '\')"' +
                                                                 ' tabindex="-1"' +
                                                                 ' title="', editor.lang.elementsPath.eleTitle.replace( /%1/, name ), '"' +
+                                                                ' onfocus="return CKEDITOR._.elementsPath.focus(', index, ', event );"' +
                                                                 ' onkeydown="return CKEDITOR._.elementsPath.keydown(\'', this.name, '\',', index, ', event);"' +
                                                                 extra ,
                                                                 ' onclick="return CKEDITOR._.elementsPath.click(\'', this.name, '\',', index, ');">',
@@ -175 +176 @@
                         //      alert( ev.getKeystroke() );
                 }
                 return true;
-        }
+        },
+        focus : function( index, ev )
+        {
+                // FF2: prevent focus event been bubbled up to editor container, which caused unexpected editor focus. 
+                if ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 )
+                        ev.preventBubble();
+        }       
 };

_source/plugins/button/plugin.js

@@ -232 +232 @@
 
         focus : function( index, ev )
         {
-                var instance = CKEDITOR.ui.button._.instances[ index ];
+                var instance = CKEDITOR.ui.button._.instances[ index ],
+                        retVal;
 
                 if ( instance.onfocus )
-                        return ( instance.onfocus( instance, new CKEDITOR.dom.event( ev ) ) !== false );
+                        retVal = ( instance.onfocus( instance, new CKEDITOR.dom.event( ev ) ) !== false );
+
+                // FF2: prevent focus event been bubbled up to editor container, which caused unexpected editor focus. 
+                if ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 )
+                        ev.preventBubble();
+                return retVal;
         }
 };