Ticket #3230: 3230.patch

_source/plugins/dialogui/plugin.js

@@ -452 +452 @@
                                         {
                                                 var element = this.getElement();
 
-                                                element.on( 'mousedown', function( evt )
-                                                        {
-                                                                // If button is disabled, don't do anything.
-                                                                if ( me._.disabled )
-                                                                        return;
-
-                                                                // Store the currently active button.
-                                                                CKEDITOR.ui.dialog.button._.activeButton = [ me, me.getElement() ];
-                                                        } );
-
-                                                element.on( 'keydown', function( evt )
-                                                        {
-                                                                // Click if Enter is pressed.
-                                                                if ( evt.data.$.keyCode == 13 )
-                                                                {
-                                                                        me.fire( 'click', { dialog : me.getDialog() } );
-                                                                        evt.data.preventDefault();
-                                                                }
-                                                        } );
-
-                                                if ( !eventInfo.data.buttonHandlerRegistered )
+                                                (function()
                                                 {
-                                                        CKEDITOR.document.on( 'mouseup', function( evt )
+                                                        element.on( 'click', function( evt )
                                                                 {
-                                                                        var target = evt.data.getTarget(),
-                                                                                activeButton = CKEDITOR.ui.dialog.button._.activeButton;
-
-                                                                        // If there's no active button, bail out.
-                                                                        if ( !activeButton )
-                                                                                return;
-
-                                                                        // Fire the click event - but only if the
-                                                                        // active button is the same as target.
-                                                                        if ( activeButton[1].equals( target.getAscendant( 'a' ) ) )
-                                                                                activeButton[0].fire( 'click', { dialog : activeButton[0].getDialog() } );
-
-                                                                        // Clear active button flag.
-                                                                        CKEDITOR.ui.dialog.button._.activeButton = null;
+                                                                        me.fire( 'click', { dialog : me.getDialog() } );
                                                                 } );
+                                                })();
 
-                                                        eventInfo.data.buttonHandlerRegistered = true;
-                                                }
-
-                                                this.getElement().getFirst().unselectable();
+                                                element.unselectable();
                                         }, this );
 
                                 var outerDefinition = CKEDITOR.tools.extend( {}, elementDefinition );
@@ -510 +475 @@
                                         null,
                                         {
                                                 style : elementDefinition.style,
-                                                href : 'javascript:void(0);', 
+                                                href : 'javascript:void(0)', 
                                                 title : elementDefinition.label, 
                                                 hidefocus : 'true'
                                         },
@@ -1258 +1223 @@
 
         CKEDITOR.ui.dialog.fileButton.prototype = new CKEDITOR.ui.dialog.button;
 
-        CKEDITOR.ui.dialog.button._ = { activeButton : null };
-
         CKEDITOR.dialog.addUIElement( 'text', textBuilder );
         CKEDITOR.dialog.addUIElement( 'password', textBuilder );
         CKEDITOR.dialog.addUIElement( 'textarea', commonBuilder );