Changeset 4352

Timestamp:

10/12/09 18:21:44 (4 years ago)

Author:

garry.yao

Message:

Fixing #4504: 'Enter'/'Esc' key is not working on dialog button.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/core/dom/event.js (modified) (1 diff)
• _source/plugins/dialog/plugin.js (modified) (1 diff)
• _source/plugins/sourcearea/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -79 +79 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4351">#4351</a> : Dash and dot could appear in attribute names.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4355">#4355</a> : 'maximize' and 'showblock' commands shouldn't take editor focus.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4504">#4504</a> : Fixed 'Enter'/'Esc' key is not working on dialog button.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/core/dom/event.js

@@ -88 +88 @@
 
                 if ( stopPropagation )
-                {
-                        if ( $.stopPropagation )
-                                $.stopPropagation();
-                        else
-                                $.cancelBubble = true;
-                }
+                        this.stopPropagation();
         },
+
+        stopPropagation : function()
+        {
+                var $ = this.$;
+                if ( $.stopPropagation )
+                        $.stopPropagation();
+                else
+                        $.cancelBubble = true;
+        },
+
         /**
          * Returns the DOM node where the event was targeted to.

CKEditor/trunk/_source/plugins/dialog/plugin.js

@@ -1855 +1855 @@
         {
                 if ( e.data.getKeystroke() in preventKeyBubblingKeys )
-                        e.data.preventDefault( true );
+                        e.data.stopPropagation();
         };
 

CKEditor/trunk/_source/plugins/sourcearea/plugin.js

@@ -81 +81 @@
                                                                 textarea.on( 'mousedown', function( evt )
                                                                         {
-                                                                                evt = evt.data.$;
-                                                                                if ( evt.stopPropagation )
-                                                                                        evt.stopPropagation();
+                                                                                evt.data.stopPropagation();
                                                                         } );
                                                         }