Ticket #4269: 4269_4.patch

_source/plugins/dialog/plugin.js

@@ -641 +641 @@
                                 this._.parentDialog = null;
                                 addCover( this._.editor );
 
-                                CKEDITOR.document.on( 'keydown', accessKeyDownHandler );
-                                CKEDITOR.document.on( 'keyup', accessKeyUpHandler );
+                                element.on( 'keydown', accessKeyDownHandler );
+                                element.on( 'keyup', accessKeyUpHandler );
 
                                 // Prevent some keys from bubbling up. (#4269)
                                 for ( var event in { keyup :1, keydown :1, keypress :1 } )
-                                        CKEDITOR.document.on( event, preventKeyBubbling );
+                                        element.on( event, preventKeyBubbling );
                         }
                         else
                         {
@@ -771 +771 @@
                                 CKEDITOR.dialog._.currentZIndex = null;
 
                                 // Remove access key handlers.
-                                CKEDITOR.document.removeListener( 'keydown', accessKeyDownHandler );
-                                CKEDITOR.document.removeListener( 'keyup', accessKeyUpHandler );
-                                CKEDITOR.document.removeListener( 'keypress', accessKeyUpHandler );
+                                element.removeListener( 'keydown', accessKeyDownHandler );
+                                element.removeListener( 'keyup', accessKeyUpHandler );
+                                element.removeListener( 'keypress', accessKeyUpHandler );
 
                                 // Remove bubbling-prevention handler. (#4269)
                                 for ( var event in { keyup :1, keydown :1, keypress :1 } )
-                                        CKEDITOR.document.removeListener( event, preventKeyBubbling );
+                                        element.removeListener( event, preventKeyBubbling );
 
                                 var editor = this._.editor;
                                 editor.focus();

_source/plugins/dialogui/plugin.js

@@ -222 +222 @@
                                                         {
                                                                 if ( evt.data.getKeystroke() == 13 && keyPressedOnMe )
                                                                 {
-                                                                        dialog.getButton( 'ok' ) && dialog.getButton( 'ok' ).click();
+                                                                        dialog.getButton( 'ok' ) && setTimeout( function ()
+                                                                        {
+                                                                                dialog.getButton( 'ok' ).click();
+                                                                        }, 0 );
                                                                         keyPressedOnMe = false;
                                                                 }
                                                         }, null, null, 1000 );