Changeset 9188

Timestamp:

06/18/07 02:08:44 (19 months ago)

Author:

bill

Message:

Refactor TooltipDialog? to use dijit.util.popup.
Refs #2826.

Location:

dijit/trunk

Files:

• layout/Dialog.js (modified) (1 diff)
• layout/templates/TooltipDialog.html (modified) (1 diff)
• themes/dijit.css (modified) (1 diff)
• themes/tundra/tundra.css (modified) (1 diff)

dijit/trunk/layout/Dialog.js

@@ -300 +300 @@
 dojo.declare(
         "dijit.layout.TooltipDialog",
-        [dijit.layout.Dialog],
+        [dijit.layout.ContentPane, dijit.base.TemplatedWidget],
         {
                 // summary:
                 //              Pops up a dialog that appears like a Tooltip
 
+                // closeNode: String
+                //      Id of button or other dom node to click to close this dialog
+                closeNode: "",
+
                 templatePath: dojo.moduleUrl("dijit.layout", "templates/TooltipDialog.html"),
 
-                show: function(/*Widget||DomNode*/ anchor){
+                postCreate: function(){
+                        dijit.layout.TooltipDialog.superclass.postCreate.apply(this, arguments);
+                        this.domNode.style.display="none";
+                },
+
+                startup: function(){
+                        var closeNode = dojo.byId(this.closeNode);
+                        this.connect(closeNode, "onclick", "hide");
+                },
+
+                show: function(/*DomNode*/ anchor){
                         // summary: display the dialog underneath specified button/link
-                        this.anchor = dijit.byId(anchor) || dojo.byId(anchor);
-                        dijit.layout.TooltipDialog.superclass.show.call(this);
-                },
-
-                _position: function() {
-                        var pos = dijit.util.placeOnScreenAroundElement(this.domNode, this.anchor, {'BL': 'TL', 'TL': 'BL'});
-                        this.domNode.className="dijitDialog dijitTooltip dijitTooltip" + (pos.corner=='TL' ? "Below" : "Above");
+                        var pos = dijit.util.popup.openAround(this, anchor, {'BL': 'TL', 'TL': 'BL'});
+                        this.domNode.className="dijitTooltipDialog dijitTooltip" + (pos.corner=='TL' ? "Below" : "Above");
+                },
+                
+                hide: function(){
+                        // summary: hide the dialog
+                        dijit.util.popup.close();
                 }
         }

dijit/trunk/layout/templates/TooltipDialog.html

@@ -1 @@
-<div class="dijitDialog dijitTooltip">
-        <span dojoAttachPoint="tabStartOuter" dojoAttachEvents="onfocus: _trapTabs; onblur: _clearTrap" tabindex="0"></span>
-        <span dojoAttachPoint="tabStart" dojoAttachEvents="onfocus: _trapTabs; onblur: _clearTrap" tabindex="0"></span>
+<div id="${id}" class="dijitTooltipDialog">
         <div class="dijitTooltipContainer dijitTooltipContents" dojoAttachPoint="containerNode" waiRole='alert'></div>
         <div class="dijitTooltipConnector"></div>
-        <span dojoAttachPoint="tabEnd" dojoAttachEvents="onfocus: _trapTabs; onblur: _clearTrap;" tabindex="0"></span>
-        <span dojoAttachPoint="tabEndOuter" dojoAttachEvents="onfocus: _trapTabs; onblur: _clearTrap" tabindex="0"></span>
 </div>

dijit/trunk/themes/dijit.css

@@ -608 +608 @@
         overflow: visible;
 }
-
+.dijitTooltipDialog {
+        position: relative;
+}
 .dijitTooltipContainer {
         border: solid black 2px;

dijit/trunk/themes/tundra/tundra.css

@@ -540 +540 @@
 /*Tooltip*/
 
-.tundra .dijitTooltip {
+.tundra .dijitTooltip,
+.tundra .dijitTooltipDialog {
         /* the outermost dom node, holding the connector and container */
-        opacity: 0.9;
-        border: none;
-        background: transparent;
+        opacity: 0.95;
 }