Ticket #5622: 5622_2.patch
File 5622_2.patch, 2.2 KB (added by , 14 years ago) |
---|
-
_source/plugins/wysiwygarea/plugin.js
373 373 setTimeout( function() 374 374 { 375 375 // Prefer 'contentEditable' instead of 'designMode'. (#3593) 376 if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 ) 376 if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 377 || CKEDITOR.env.opera ) 377 378 domDocument.$.body.contentEditable = true; 378 else if ( CKEDITOR.env.webkit || CKEDITOR.env.opera)379 else if ( CKEDITOR.env.webkit ) 379 380 domDocument.$.body.parentNode.contentEditable = true; 380 381 else 381 382 domDocument.$.designMode = 'on'; … … 454 455 // clicking outside actual content, manually apply the focus. (#1659) 455 456 if ( CKEDITOR.env.ie 456 457 && domDocument.$.compatMode == 'CSS1Compat' 457 || CKEDITOR.env.gecko ) 458 || CKEDITOR.env.gecko 459 || CKEDITOR.env.opera ) 458 460 { 459 461 var htmlElement = domDocument.getDocumentElement(); 460 462 htmlElement.on( 'mousedown', function( evt ) … … 480 482 481 483 focusTarget.on( 'focus', function() 482 484 { 485 // Force the cursor blinking. (#5622 486 CKEDITOR.env.gecko && blinkCursor(); 483 487 editor.focusManager.focus(); 484 488 }); 485 489 … … 764 768 isPendingFocus = true; 765 769 else if ( editor.window ) 766 770 { 767 editor.window.focus(); 771 // [Webkit] Force the cursor blinking 772 // when setting focus manually. (#5622) 773 CKEDITOR.env.webkit && blinkCursor(); 774 775 if ( CKEDITOR.env.opera ) 776 editor.document.getBody().focus(); 777 else 778 editor.window.focus(); 779 768 780 editor.selectionChange(); 769 781 } 770 782 } … … 797 809 } 798 810 799 811 // Create an invisible element to grab focus. 800 if ( CKEDITOR.env.gecko || CKEDITOR.env.ie )812 if ( CKEDITOR.env.gecko || CKEDITOR.env.ie || CKEDITOR.env.opera ) 801 813 { 802 814 var focusGrabber; 803 815 editor.on( 'uiReady', function()