Ticket #6200: 6200_2.patch
File 6200_2.patch, 9.0 KB (added by , 13 years ago) |
---|
-
_source/plugins/dialog/plugin.js
2338 2338 dialog._.hasFocus = true; 2339 2339 me.fire( 'focus' ); 2340 2340 }, me ); 2341 me.getInputElement().on( 'blur', function() 2342 { 2343 me.fire( 'blur' ); 2344 }, me ); 2341 2345 } 2342 2346 } ); 2343 2347 -
_source/plugins/dialogui/plugin.js
384 384 myDefinition.style = myDefinition.controlStyle; 385 385 386 386 _.checkbox = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'input', null, attributes ); 387 388 // IE < 8 don't show the "focus outline" for certain elements (#6200). 389 if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 ) 390 { 391 _.checkbox.on( 'focus', function() 392 { 393 this.getInputElement().addClass( 'cke_dialog_ui_selected' ); 394 }); 395 _.checkbox.on( 'blur', function() 396 { 397 this.getInputElement().removeClass( 'cke_dialog_ui_selected' ); 398 }); 399 } 400 387 401 html.push( ' <label id="', labelId, '" for="', attributes.id, '">', 388 402 CKEDITOR.tools.htmlEncode( elementDefinition.label ), 389 403 '</label>' ); … … 1213 1227 } 1214 1228 }, 1215 1229 1216 keyboardFocusable : true1230 keyboardFocusable : 1 1217 1231 }, commonPrototype, true ); 1218 1232 1219 1233 CKEDITOR.ui.dialog.radio.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement, -
_source/plugins/image/dialogs/image.js
757 757 { 758 758 this.removeClass( 'cke_btn_over' ); 759 759 }, resetButton ); 760 761 762 // IE < 8 don't show the "focus outline" for certain elements (#6200). 763 if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 ) 764 { 765 resetButton.on( 'focus', function(){ this.addClass( 'cke_dialog_ui_selected' ); }, resetButton ); 766 resetButton.on( 'blur', function(){ this.removeClass( 'cke_dialog_ui_selected' ); }, resetButton ); 767 } 760 768 } 761 769 // Activate (Un)LockRatio button 762 770 if ( ratioButton ) … … 786 794 { 787 795 this.removeClass( 'cke_btn_over' ); 788 796 }, ratioButton ); 797 798 // IE < 8 don't show the "focus outline" for certain elements (#6200). 799 if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 ) 800 { 801 ratioButton.on( 'focus', function(){ this.addClass( 'cke_dialog_ui_selected' ); }, ratioButton ); 802 ratioButton.on( 'blur', function(){ this.removeClass( 'cke_dialog_ui_selected' ); }, ratioButton ); 803 } 789 804 } 790 805 }, 791 806 html : '<div>'+ -
_source/skins/kama/dialog.css
277 277 padding-right: 2px !important; 278 278 } 279 279 280 .cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text { 280 .cke_skin_kama .cke_browser_ie.cke_rtl div.cke_dialog_ui_input_text 281 { 281 282 padding-right: 1px; 282 283 } 283 284 … … 315 316 padding: 1px 0px; 316 317 } 317 318 319 /* #6200: Some browsers doesn't show the "focus outline" for certain elements */ 320 .cke_skin_kama .cke_browser_ie .cke_dialog_ui_checkbox_input 321 { 322 border: 1px solid transparent; 323 } 324 .cke_skin_kama .cke_browser_ie .cke_dialog_ui_selected 325 { 326 border: 1px dotted #696969 !important; 327 } 328 .cke_skin_kama .cke_browser_gecko .cke_dialog_ui_checkbox_input:focus, 329 .cke_skin_kama .cke_browser_gecko .cke_dialog_ui_input_select:focus 330 { 331 outline: 1px dotted #696969; 332 } 333 318 334 .cke_skin_kama div.cke_disabled .cke_dialog_ui_labeled_content * 319 335 { 320 336 background-color : #a0a0a0; … … 691 707 width: 16px; 692 708 height: 16px; 693 709 background-repeat: no-repeat; 694 border: 1px none;695 710 font-size: 1px; 711 border: 1px solid transparent; 696 712 } 697 713 698 714 .cke_skin_kama .cke_rtl .cke_dialog a.cke_btn_reset … … 709 725 width: 16px; 710 726 height: 16px; 711 727 background-repeat: no-repeat; 712 border: none 1px;713 728 font-size: 1px; 729 border: 1px solid transparent; 714 730 } 715 731 716 732 .cke_skin_kama .cke_rtl .cke_dialog a.cke_btn_locked, … … 741 757 background-color : white; 742 758 } 743 759 744 .cke_skin_kama .cke_dialog .ImagePreviewBox table td { 760 .cke_skin_kama .cke_dialog .ImagePreviewBox table td 761 { 745 762 white-space: normal; 746 763 } 747 764 … … 762 779 padding : 2px; 763 780 opacity : 0.9; 764 781 filter : alpha(opacity=90); 765 766 782 background-color : #e4e4e4; 767 783 } 768 784 769 .cke_skin_kama .cke_dialog 785 .cke_skin_kama .cke_dialog .FlashPreviewBox 770 786 { 771 787 white-space : normal; 772 788 border : 2px ridge black; … … 919 935 .cke_skin_kama .cke_rtl .cke_dialog_contents a.colorChooser 920 936 { 921 937 margin-right: 10px; 922 } 938 } 939 No newline at end of file -
_source/skins/office2003/dialog.css
402 402 padding: 1px 0px; 403 403 } 404 404 405 /* #6200: Some browsers doesn't show the "focus outline" for certain elements */ 406 .cke_skin_office2003 .cke_browser_ie .cke_dialog_ui_checkbox_input 407 { 408 border: 1px solid transparent; 409 } 410 .cke_skin_office2003 .cke_browser_ie .cke_dialog_ui_selected 411 { 412 border: 1px dotted #696969 !important; 413 } 414 .cke_skin_office2003 .cke_browser_gecko .cke_dialog_ui_checkbox_input:focus, 415 .cke_skin_office2003 .cke_browser_gecko .cke_dialog_ui_input_select:focus 416 { 417 outline: 1px dotted #696969; 418 } 419 405 420 .cke_skin_office2003 div.cke_disabled .cke_dialog_ui_labeled_content * 406 421 { 407 422 background-color : #a0a0a0; … … 614 629 width: 16px; 615 630 height: 16px; 616 631 background-repeat: no-repeat; 617 border: 1px none;618 632 font-size: 1px; 633 border: 1px solid transparent; 619 634 } 620 635 621 636 .cke_skin_office2003 .cke_rtl .cke_dialog a.cke_btn_reset … … 632 647 width: 16px; 633 648 height: 16px; 634 649 background-repeat: no-repeat; 635 border: none 1px;636 650 font-size: 1px; 651 border: 1px solid transparent; 637 652 } 638 653 639 654 .cke_skin_office2003 .cke_rtl .cke_dialog a.cke_btn_locked, … … 654 669 cursor: pointer; 655 670 } 656 671 657 .cke_skin_office2003 .cke_dialog 672 .cke_skin_office2003 .cke_dialog .ImagePreviewBox 658 673 { 659 674 border : 2px ridge black; 660 675 overflow : scroll; … … 664 679 background-color : white; 665 680 } 666 681 667 .cke_skin_office2003 .cke_dialog .ImagePreviewBox table td { 682 .cke_skin_office2003 .cke_dialog .ImagePreviewBox table td 683 { 668 684 white-space: normal; 669 685 } 670 686 -
_source/skins/v2/dialog.css
401 401 padding: 1px 0px; 402 402 } 403 403 404 /* #6200: Some browsers doesn't show the "focus outline" for certain elements */ 405 .cke_skin_v2 .cke_browser_ie .cke_dialog_ui_checkbox_input 406 { 407 border: 1px solid transparent; 408 } 409 .cke_skin_v2 .cke_browser_ie .cke_dialog_ui_selected 410 { 411 border: 1px dotted #696969 !important; 412 } 413 .cke_skin_v2 .cke_browser_gecko .cke_dialog_ui_checkbox_input:focus, 414 .cke_skin_v2 .cke_browser_gecko .cke_dialog_ui_input_select:focus 415 { 416 outline: 1px dotted #696969; 417 } 418 404 419 .cke_skin_v2 div.cke_disabled .cke_dialog_ui_labeled_content * 405 420 { 406 421 background-color : #a0a0a0; … … 616 631 width: 16px; 617 632 height: 16px; 618 633 background-repeat: no-repeat; 619 border: 1px none;620 634 font-size: 1px; 635 border: 1px solid transparent; 621 636 } 622 637 623 638 .cke_skin_v2 .cke_rtl .cke_dialog a.cke_btn_reset … … 634 649 width: 16px; 635 650 height: 16px; 636 651 background-repeat: no-repeat; 637 border: none 1px;638 652 font-size: 1px; 653 border: 1px solid transparent; 639 654 } 640 655 641 656 .cke_skin_v2 .cke_rtl .cke_dialog a.cke_btn_locked, … … 656 671 cursor: pointer; 657 672 } 658 673 659 .cke_skin_v2 .cke_dialog 674 .cke_skin_v2 .cke_dialog .ImagePreviewBox 660 675 { 661 676 border : 2px ridge black; 662 677 overflow : scroll; … … 666 681 background-color : white; 667 682 } 668 683 669 .cke_skin_v2 .cke_dialog .ImagePreviewBox table td { 684 .cke_skin_v2 .cke_dialog .ImagePreviewBox table td 685 { 670 686 white-space: normal; 671 687 } 672 688 … … 676 692 _position: absolute; 677 693 } 678 694 679 .cke_skin_v2 .cke_dialog 695 .cke_skin_v2 .cke_dialog .ImagePreviewLoader 680 696 { 681 697 position: absolute; 682 698 white-space : normal; … … 691 707 background-color : #e4e4e4; 692 708 } 693 709 694 .cke_skin_v2 .cke_dialog 710 .cke_skin_v2 .cke_dialog .FlashPreviewBox 695 711 { 696 712 white-space : normal; 697 713 border : 2px ridge black;