Ticket #4677: 4677_2.patch
File 4677_2.patch, 2.5 KB (added by , 14 years ago) |
---|
-
_source/core/dom/element.js
739 739 */ 740 740 isVisible : function() 741 741 { 742 return this.$.offsetWidth && ( this.$.style.visibility != 'hidden' ); 742 { 743 var elementWindow = this.getWindow(), 744 elementFrame, 745 isVisible = !!this.$.offsetHeight && this.getComputedStyle( 'visibility' ) != 'hidden'; 746 747 // Webkit and Opera report non-zero offsetHeight despite that 748 // element is inside an invisible iframe. (#4542) 749 if( isVisible && ( CKEDITOR.env.webkit || CKEDITOR.env.opera ) 750 && !elementWindow.equals( CKEDITOR.document.getWindow() ) 751 && ( elementFrame = elementWindow.$.frameElement ) ) 752 isVisible = new CKEDITOR.dom.element( elementFrame ).isVisible(); 753 754 return isVisible; 755 } 743 756 }, 744 757 745 758 /** -
_source/plugins/dialog/plugin.js
464 464 this.focusIndex = index; 465 465 this.isFocusable = function() 466 466 { 467 return true;467 return !( element.getAttribute( 'disabled' ) || !element.isVisible() ) 468 468 }; 469 469 this.focus = function() 470 470 { … … 2460 2460 */ 2461 2461 isVisible : function() 2462 2462 { 2463 var element = this.getInputElement(), 2464 elementWindow = element.getWindow(), 2465 elementFrame, 2466 isVisible = !!element.$.offsetHeight; 2467 2468 // Webkit and Opera report non-zero offsetHeight despite that 2469 // element is inside an invisible iframe. (#4542) 2470 if( isVisible && ( CKEDITOR.env.webkit || CKEDITOR.env.opera ) 2471 && !elementWindow.equals( CKEDITOR.document.getWindow() ) 2472 && ( elementFrame = elementWindow.$.frameElement ) ) 2473 isVisible = !!elementFrame.offsetHeight; 2474 2475 return isVisible; 2463 return this.getInputElement().isVisible(); 2476 2464 }, 2477 2465 2478 2466 /** -
_source/plugins/dialogui/plugin.js
838 838 839 839 isVisible : function() 840 840 { 841 return !!this.getElement().$.firstChild.offsetHeight;841 return this.getElement().getFirst().isVisible(); 842 842 }, 843 843 844 844 isEnabled : function()