Changeset 12692

Show
Ignore:
Timestamp:
02/25/08 05:16:49 (11 months ago)
Author:
bill
Message:

Refs #5697: previous checkin was incorrect; for TooltipDialog? etc. this.containerNode exists, but visibility is still set on this.domNode. (OTOH for TitlePane? and AccordionPane?, visibility of the section w/the href is controlled on this.containerNode)

Location:
dijit/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • dijit/trunk/layout/AccordionContainer.js

    r12691 r12692  
    205205                this.focusNode.setAttribute("tabIndex", isSelected ? "0" : "-1"); 
    206206        }, 
    207          
     207 
    208208        _handleFocus: function(/*Event*/e){ 
    209209                // summary: handle the blur and focus state of this widget 

  • dijit/trunk/layout/ContentPane.js

    r12691 r12692  
    237237        }, 
    238238 
    239         _loadCheck: function(forceLoad){ 
     239        _isOpen: function(){ 
     240                // summary: returns true if the content is currently shown 
     241                if("open" in this){ 
     242                        return this.open;               // for TitlePane, etc. 
     243                }else if("selected" in this){ 
     244                        return this.selected;   // AccordionContainer, TabContainer 
     245                }else{ 
     246                        var node = this.domNode; 
     247                        return (node.style.display != 'none')  && (node.style.visibility != 'hidden'); 
     248                } 
     249        }, 
     250 
     251        _loadCheck: function(/*Boolean*/ forceLoad){ 
    240252                // call this when you change onShow (onSelected) status when selected in parent container 
    241253                // it's used as a trigger for href download when this.domNode.display != 'none' 
    … …  
    250262                //                                              domNode display != 'none', isLoaded must be false 
    251263 
    252                 var node = this.containerNode || this.domNode, 
    253                         displayState = ((this.open !== false) && (node.style.display != 'none')  && (node.style.visibility != 'hidden')); 
     264                var displayState = this._isOpen(); 
    254265 
    255266                if(this.href &&  

  • dijit/trunk/tests/test_TooltipDialog.html

    r12162 r12692  
    33<html> 
    44<head> 
    5         <title>Dialog Widget Dojo Tests</title> 
     5        <title>TooltipDialog Widget Tests</title> 
    66        <style type="text/css"> 
    77                @import "../../dojo/resources/dojo.css"; 
    … …  
    121121<div dojoType="dijit.form.DropDownButton"> 
    122122        <span>Test slowloading HREF Tooltip Dialog</span> 
    123         <div dojoType="dijit.TooltipDialog" href="layout/getResponse.php?delay=500&messId=2" title="tooltip dialog with no focusable items"> 
    124         </div> 
     123        <div dojoType="dijit.TooltipDialog" id="slowLoad" href="layout/getResponse.php?delay=500&messId=2" 
     124                title="tooltip dialog with no focusable items"></div> 
    125125</div> | 
    126126