Ticket #4269: 4269.patch

_source/plugins/dialogui/plugin.js

@@ -214 +214 @@
                                                 me.getInputElement().on( 'keydown', function( evt )
                                                         {
                                                                 if ( evt.data.getKeystroke() == 13 )
+                                                                {
                                                                         keyPressedOnMe = true;
+                                                                        evt.data.preventDefault( true );
+                                                                }
                                                         } );
 
                                                 // Lower the priority this 'keyup' since 'ok' will close the dialog.(#3749)
@@ -224 +227 @@
                                                                 {
                                                                         dialog.getButton( 'ok' ) && dialog.getButton( 'ok' ).click();
                                                                         keyPressedOnMe = false;
+                                                                        evt.data.preventDefault( true );
                                                                 }
                                                         }, null, null, 1000 );
+
+                                                // Prevent enter key from bubbling up. (#4269)
+                                                // Needed for FF, Safari, Opera.
+                                                me.getInputElement().on( 'keypress', function( evt )
+                                                        {
+                                                                if ( evt.data.getKeystroke() == 13 )
+                                                                        evt.data.preventDefault( true );
+                                                        } );
                                         } );
 
                                 /** @ignore */

_source/plugins/dialog/plugin.js

@@ -623 +623 @@
 
                                 CKEDITOR.document.on( 'keydown', accessKeyDownHandler );
                                 CKEDITOR.document.on( 'keyup', accessKeyUpHandler );
+
+                                // Prevent Esc key from bubbling up. (#4269)
+                                for ( var event in { keyup: 1, keydown : 1, keypress : 1 })
+                                        CKEDITOR.document.on( event, preventEscBubbling );
                         }
                         else
                         {
@@ -749 +753 @@
                                 // Remove access key handlers.
                                 CKEDITOR.document.removeListener( 'keydown', accessKeyDownHandler );
                                 CKEDITOR.document.removeListener( 'keyup', accessKeyUpHandler );
+                                CKEDITOR.document.removeListener( 'keypress', accessKeyUpHandler );
 
+                                // Prevent Esc key from bubbling up. (#4269)
+                                for ( var event in { keyup: 1, keydown : 1, keypress : 1 })
+                                        CKEDITOR.document.removeListener( event, preventEscBubbling );
+
                                 var editor = this._.editor;
                                 editor.focus();
 
@@ -1836 +1845 @@
         {
         };
 
+        var preventEscBubbling = function( e )
+        {
+                e.data.getKeystroke() == 27 && 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>