Ticket #4269: 4269_4.patch
File 4269_4.patch, 2.2 KB (added by , 14 years ago) |
---|
-
_source/plugins/dialog/plugin.js
641 641 this._.parentDialog = null; 642 642 addCover( this._.editor ); 643 643 644 CKEDITOR.document.on( 'keydown', accessKeyDownHandler );645 CKEDITOR.document.on( 'keyup', accessKeyUpHandler );644 element.on( 'keydown', accessKeyDownHandler ); 645 element.on( 'keyup', accessKeyUpHandler ); 646 646 647 647 // Prevent some keys from bubbling up. (#4269) 648 648 for ( var event in { keyup :1, keydown :1, keypress :1 } ) 649 CKEDITOR.document.on( event, preventKeyBubbling );649 element.on( event, preventKeyBubbling ); 650 650 } 651 651 else 652 652 { … … 771 771 CKEDITOR.dialog._.currentZIndex = null; 772 772 773 773 // Remove access key handlers. 774 CKEDITOR.document.removeListener( 'keydown', accessKeyDownHandler );775 CKEDITOR.document.removeListener( 'keyup', accessKeyUpHandler );776 CKEDITOR.document.removeListener( 'keypress', accessKeyUpHandler );774 element.removeListener( 'keydown', accessKeyDownHandler ); 775 element.removeListener( 'keyup', accessKeyUpHandler ); 776 element.removeListener( 'keypress', accessKeyUpHandler ); 777 777 778 778 // Remove bubbling-prevention handler. (#4269) 779 779 for ( var event in { keyup :1, keydown :1, keypress :1 } ) 780 CKEDITOR.document.removeListener( event, preventKeyBubbling );780 element.removeListener( event, preventKeyBubbling ); 781 781 782 782 var editor = this._.editor; 783 783 editor.focus(); -
_source/plugins/dialogui/plugin.js
222 222 { 223 223 if ( evt.data.getKeystroke() == 13 && keyPressedOnMe ) 224 224 { 225 dialog.getButton( 'ok' ) && dialog.getButton( 'ok' ).click(); 225 dialog.getButton( 'ok' ) && setTimeout( function () 226 { 227 dialog.getButton( 'ok' ).click(); 228 }, 0 ); 226 229 keyPressedOnMe = false; 227 230 } 228 231 }, null, null, 1000 );