Ticket #7594: 7645.patch

_source/plugins/toolbar/plugin.js

@@ -393 +393 @@
                                                 instance = items[ i ];
                                                 if ( instance.clickFn ) CKEDITOR.tools.removeFunction( instance.clickFn );
                                                 if ( instance.keyDownFn ) CKEDITOR.tools.removeFunction( instance.keyDownFn );
-
-                                                if ( instance.index ) CKEDITOR.ui.button._.instances[ instance.index ] = null;
                                         }
                                 }
                         });

_source/plugins/button/plugin.js

@@ -55 +55 @@
         }
 };
 
-/**
- * Handles a button click.
- * @private
- */
-CKEDITOR.ui.button._ =
-{
-        instances : [],
-
-        keydown : function( index, ev )
-        {
-                var instance = CKEDITOR.ui.button._.instances[ index ];
-
-                if ( instance.onkey )
-                {
-                        ev = new CKEDITOR.dom.event( ev );
-                        return ( instance.onkey( instance, ev.getKeystroke() ) !== false );
-                }
-        },
-
-        focus : function( index, ev )
-        {
-                var instance = CKEDITOR.ui.button._.instances[ index ],
-                        retVal;
-
-                if ( instance.onfocus )
-                        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;
-        }
-};
-
 ( function()
 {
-        var keydownFn = CKEDITOR.tools.addFunction( CKEDITOR.ui.button._.keydown, CKEDITOR.ui.button._ ),
-                focusFn = CKEDITOR.tools.addFunction( CKEDITOR.ui.button._.focus, CKEDITOR.ui.button._ );
-
 CKEDITOR.ui.button.prototype =
 {
         canGroup : true,
@@ -112 +75 @@
                         id = this._.id = CKEDITOR.tools.getNextId(),
                         classes = '',
                         command = this.command, // Get the command name.
-                        clickFn,
-                        index;
+                        clickFn;
 
                 this._.editor = editor;
 
@@ -133 +95 @@
                         }
                 };
 
+                var keydownFn = CKEDITOR.tools.addFunction( function( ev )
+                        {
+                                if ( instance.onkey )
+                                {
+                                        ev = new CKEDITOR.dom.event( ev );
+                                        return ( instance.onkey( instance, ev.getKeystroke() ) !== false );
+                                }
+                        });
+
+                var focusFn = CKEDITOR.tools.addFunction( function( ev )
+                        {
+                                var retVal;
+
+                                if ( instance.onfocus )
+                                          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;
+                        });
+
                 instance.clickFn = clickFn = CKEDITOR.tools.addFunction( instance.execute, instance );
 
-                instance.index = index = CKEDITOR.ui.button._.instances.push( instance ) - 1;
 
                 // Indicate a mode sensitive button.
                 if ( this.modes )
@@ -224 +207 @@
                 }
 
                 output.push(
-                                        ' onkeydown="return CKEDITOR.tools.callFunction(', keydownFn, ', ', index, ', event);"' +
-                                        ' onfocus="return CKEDITOR.tools.callFunction(', focusFn,', ', index, ', event);"' +
+                                        ' onkeydown="return CKEDITOR.tools.callFunction(', keydownFn, ', event);"' +
+                                        ' onfocus="return CKEDITOR.tools.callFunction(', focusFn,', event);"' +
                                 ' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
                                         '<span class="cke_icon"' );
 
@@ -302 +285 @@
 {
         this.add( name, CKEDITOR.UI_BUTTON, definition );
 };
-
-CKEDITOR.on( 'reset', function()
-        {
-                CKEDITOR.ui.button._.instances = [];
-        });