Ticket #4269: 4269_2.patch

_source/plugins/dialog/plugin.js

@@ -623 +623 @@
 
                                 CKEDITOR.document.on( 'keydown', accessKeyDownHandler );
                                 CKEDITOR.document.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 );
                         }
                         else
                         {
@@ -749 +753 @@
                                 // Remove access key handlers.
                                 CKEDITOR.document.removeListener( 'keydown', accessKeyDownHandler );
                                 CKEDITOR.document.removeListener( 'keyup', accessKeyUpHandler );
+                                CKEDITOR.document.removeListener( 'keypress', accessKeyUpHandler );
 
+                                // Remove bubbling-prevention handler. (#4269)
+                                for ( var event in { keyup :1, keydown :1, keypress :1 } )
+                                        CKEDITOR.document.removeListener( event, preventKeyBubbling );
+
                                 var editor = this._.editor;
                                 editor.focus();
 
@@ -1836 +1845 @@
         {
         };
 
+        // ESC, ENTER
+        var preventKeyBubblingKeys = { 27 :1, 13 :1 };
+        var preventKeyBubbling = function( e )
+        {
+                if ( e.data.getKeystroke() in preventKeyBubblingKeys )
+                        e.data.preventDefault( true );
+        };
+
         (function()
         {
                 CKEDITOR.ui.dialog =

CHANGES.html

@@ -47 +47 @@
                 <li><a href="http://dev.fckeditor.net/ticket/3898">#3898</a> : Added validation for URL presentance in Image dialog.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3528">#3528</a> : Fixed Context Menu issue when triggered using Shift+F10.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4028">#4028</a> : Maximize control's tool tip was wrong once it is maximized.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4269">#4269</a> : "Esc" and "Enter" keystrokes are not handled when a dialogue box is opened which causes the form post automatically.</li>
         </ul>
         <h3>
                 CKEditor 3.0</h3>