Ticket #8985: 8985.patch

_source/plugins/dialogui/plugin.js

@@ -240 +240 @@
                                 if ( elementDefinition.inputStyle )
                                         attributes.style = elementDefinition.inputStyle;
 
-                                // If user presses Enter in a text box, it implies clicking OK for the dialog.
-                                var me = this, keyPressedOnMe = false;
-                                dialog.on( 'load', function()
-                                        {
-                                                me.getInputElement().on( 'keydown', function( evt )
-                                                        {
-                                                                if ( evt.data.getKeystroke() == 13 )
-                                                                        keyPressedOnMe = true;
-                                                        } );
-
-                                                // Lower the priority this 'keyup' since 'ok' will close the dialog.(#3749)
-                                                me.getInputElement().on( 'keyup', function( evt )
-                                                        {
-                                                                if ( evt.data.getKeystroke() == 13 && keyPressedOnMe )
-                                                                {
-                                                                        dialog.getButton( 'ok' ) && setTimeout( function ()
-                                                                        {
-                                                                                dialog.getButton( 'ok' ).click();
-                                                                        }, 0 );
-                                                                        keyPressedOnMe = false;
-                                                                }
-                                                        }, null, null, 1000 );
-                                        } );
-
                                 /** @ignore */
                                 var innerHTML = function()
                                 {

_source/plugins/dialog/plugin.js

@@ -397 +397 @@
                 this.changeFocus = changeFocus;
 
 
-                function focusKeydownHandler( evt )
+                function keydownHandler( evt )
                 {
                         // If I'm not the top dialog, ignore.
                         if ( me != CKEDITOR.dialog._.currentTop )
@@ -450 +450 @@
                                 changeFocus( 1 );
                                 processed = 1;
                         }
+                        // If user presses enter key in a text box, it implies clicking OK for the dialog.
+                        else if ( keystroke == 13 )
+                        {
+                                // Find the currently focused element.
+                                var focused;
+                                this.foreach( function( widget )
+                                {
+                                        if ( this._.currentFocusIndex == widget.focusIndex )
+                                                focused = widget;
+                                });
 
+                                if ( focused && focused.type == 'text' )
+                                {
+                                        var okBtn = this.getButton( 'ok' );
+                                        CKEDITOR.tools.setTimeout( okBtn.click, 0, okBtn );
+                                }
+                        }
+
                         if ( processed )
                         {
                                 evt.stop();
@@ -458 +475 @@
                         }
                 }
 
-                function focusKeyPressHandler( evt )
+                function keyPressHandler( evt )
                 {
                         processed && evt.data.preventDefault();
                 }
@@ -467 +484 @@
                 // Add the dialog keyboard handlers.
                 this.on( 'show', function()
                         {
-                                dialogElement.on( 'keydown', focusKeydownHandler, this, null, 0 );
+                                dialogElement.on( 'keydown', keydownHandler, this, null, 0 );
                                 // Some browsers instead, don't cancel key events in the keydown, but in the
                                 // keypress. So we must do a longer trip in those cases. (#4531)
                                 if ( CKEDITOR.env.opera || ( CKEDITOR.env.gecko && CKEDITOR.env.mac ) )
-                                        dialogElement.on( 'keypress', focusKeyPressHandler, this );
+                                        dialogElement.on( 'keypress', keyPressHandler, this );
 
                         } );
                 this.on( 'hide', function()
                         {
-                                dialogElement.removeListener( 'keydown', focusKeydownHandler );
+                                dialogElement.removeListener( 'keydown', keydownHandler );
                                 if ( CKEDITOR.env.opera || ( CKEDITOR.env.gecko && CKEDITOR.env.mac ) )
-                                        dialogElement.removeListener( 'keypress', focusKeyPressHandler );
+                                        dialogElement.removeListener( 'keypress', keyPressHandler );
 
                                 // Reset fields state when closing dialog.
                                 iterContents( function( item ) { resetField.apply( item ); } );
@@ -486 +503 @@
                 this.on( 'iframeAdded', function( evt )
                         {
                                 var doc = new CKEDITOR.dom.document( evt.data.iframe.$.contentWindow.document );
-                                doc.on( 'keydown', focusKeydownHandler, this, null, 0 );
+                                doc.on( 'keydown', keydownHandler, this, null, 0 );
                         } );
 
                 // Auto-focus logic in dialog.