Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 7291)
+++ /CKEditor/trunk/CHANGES.html (revision 7292)
@@ -45,5 +45,5 @@
Fixed issues:
-
+ - #8333 : Allow to close the dialogs with Esc key even if there's no Cancel button.
Index: /CKEditor/trunk/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 7291)
+++ /CKEditor/trunk/_source/plugins/dialog/plugin.js (revision 7292)
@@ -820,5 +820,13 @@
registerAccessKey( this, this, '\x1b', null, function()
{
- this.getButton( 'cancel' ) && this.getButton( 'cancel' ).click();
+ var button = this.getButton( 'cancel' );
+ // If there's a Cancel button, click it, else just fire the cancel event and hide the dialog
+ if ( button )
+ button.click();
+ else
+ {
+ if ( this.fire( 'cancel', { hide : true } ).hide !== false )
+ this.hide();
+ }
} );