Ticket #4812: 4812.patch

_source/plugins/dialog/plugin.js

@@ -654 +654 @@
                                 parentElement.$.style.zIndex  -= Math.floor( this._.editor.config.baseFloatZIndex / 2 );
                                 CKEDITOR.dialog._.currentTop = this;
                         }
-
-                        // Register the Esc hotkeys.
-                        registerAccessKey( this, this, '\x1b', null, function()
-                                        {
-                                                this.getButton( 'cancel' ) && this.getButton( 'cancel' ).click();
-                                        } );
-
+                        
                         // Reset the hasFocus state.
                         this._.hasFocus = false;
 
@@ -1825 +1819 @@
                 var ctrl = evt.data.$.ctrlKey || evt.data.$.metaKey,
                         alt = evt.data.$.altKey,
                         shift = evt.data.$.shiftKey,
-                        key = String.fromCharCode( evt.data.$.keyCode ),
+                        key = String.fromCharCode( evt.data.getKey() ),
                         keyProcessor = accessKeyProcessors[( ctrl ? 'CTRL+' : '' ) + ( alt ? 'ALT+' : '') + ( shift ? 'SHIFT+' : '' ) + key];
 
                 if ( !keyProcessor || !keyProcessor.length )
                         return;
 
                 keyProcessor = keyProcessor[keyProcessor.length - 1];
-                keyProcessor.keyup && keyProcessor.keyup.call( keyProcessor.uiElement, keyProcessor.dialog, keyProcessor.key );
-                evt.data.preventDefault();
+                if( keyProcessor.keyup )
+                {
+                        keyProcessor.keyup.call( keyProcessor.uiElement, keyProcessor.dialog, keyProcessor.key );
+                        evt.data.preventDefault();
+                }
         };
 
         var registerAccessKey = function( uiElement, dialog, key, downFunc, upFunc )

_source/plugins/dialogui/plugin.js

@@ -207 +207 @@
                                 if ( elementDefinition.size )
                                         attributes.size = elementDefinition.size;
 
-                                // If user presses Enter in a text box, it implies clicking OK for the dialog.
-                                var me = this, keyPressedOnMe = false;
+                                // If user presses Enter/Esc in a text box, it implies clicking OK/Cancel button for the dialog.
+                                var me = this, keyPressedOnMe = false, keyMap = { 13: 'ok', 27: 'cancel' };
                                 dialog.on( 'load', function()
                                         {
                                                 me.getInputElement().on( 'keydown', function( evt )
                                                         {
-                                                                if ( evt.data.getKeystroke() == 13 )
+                                                                if ( evt.data.getKeystroke() in keyMap )
                                                                         keyPressedOnMe = true;
                                                         } );
 
                                                 // Lower the priority this 'keyup' since 'ok' will close the dialog.(#3749)
-                                                me.getInputElement().on( 'keyup', function( evt )
+                                                me.getInputElement().on( 'keypress', function( evt )
                                                         {
-                                                                if ( evt.data.getKeystroke() == 13 && keyPressedOnMe )
+                                                                var keyCode = evt.data.getKeystroke();
+                                                                if ( keyCode in keyMap && keyPressedOnMe )
                                                                 {
-                                                                        dialog.getButton( 'ok' ) && setTimeout( function ()
-                                                                        {
-                                                                                dialog.getButton( 'ok' ).click();
-                                                                        }, 0 );
+                                                                        var button = dialog.getButton( keyMap[ keyCode ] );
+                                                                        button && button.click();
                                                                         keyPressedOnMe = false;
                                                                 }
                                                         }, null, null, 1000 );