Changeset 12794

Timestamp:

02/29/08 18:11:39 (10 months ago)

Author:

sorvell

Message:

!strict fixes #4900. Added test in bug to grid tests. Also corrected problem with autoHeight introduced by having grid hidden in an unsized container. Fixed: grid hides in an unsized container on IE.

Location:

dojox/trunk/grid

Files:

• tests/test_grid_layout_3.html (added)
• tests/test_sizing.html (modified) (4 diffs)
• VirtualGrid.js (modified) (2 diffs)
• _grid/Grid.css (modified) (1 diff)
• _grid/tundraGrid.css (modified) (1 diff)

dojox/trunk/grid/tests/test_sizing.html

@@ -31 +31 @@
         </style>
         <script type="text/javascript" src="../../../dojo/dojo.js" 
-                djConfig="isDebug:false, parseOnLoad: true"></script>
+                djConfig="isDebug: true, parseOnLoad: true"></script>
         <script type="text/javascript">
                 dojo.require("dojox.grid.Grid");
@@ -37 +37 @@
                 dojo.require("dojo.parser");
         </script>
+        <!-- Debugging -->
+        <script type="text/javascript" src="../_grid/lib.js"></script>
+        <script type="text/javascript" src="../_grid/drag.js"></script>
+        <script type="text/javascript" src="../_grid/scroller.js"></script>
+        <script type="text/javascript" src="../_grid/builder.js"></script>
+        <script type="text/javascript" src="../_grid/cell.js"></script>
+        <script type="text/javascript" src="../_grid/layout.js"></script>
+        <script type="text/javascript" src="../_grid/rows.js"></script>
+        <script type="text/javascript" src="../_grid/focus.js"></script>
+        <script type="text/javascript" src="../_grid/selection.js"></script>
+        <script type="text/javascript" src="../_grid/edit.js"></script>
+        <script type="text/javascript" src="../_grid/view.js"></script>
+        <script type="text/javascript" src="../_grid/views.js"></script>
+        <script type="text/javascript" src="../_grid/rowbar.js"></script>
+        <script type="text/javascript" src="../_grid/publicEvents.js"></script>
+        <script type="text/javascript" src="../VirtualGrid.js"></script>
+        <script type="text/javascript" src="../_data/fields.js"></script>
+        <script type="text/javascript" src="../_data/model.js"></script>
+        <script type="text/javascript" src="../_data/editors.js"></script>
+        <script type="text/javascript" src="../Grid.js"></script>
+        <script type="text/javascript" src="support/test_data.js"></script>
         <script type="text/javascript">
                 data = [ 
@@ -144 +165 @@
         <button onclick="fitBoth()">Fit Data Width & Height</button>
         <button onclick="sizeDefault()">DefaultSize</button><br><br>
-        <div id="grid" dojoType="dojox.Grid" model="model" structure="structure" elasticView="2"></div>
+        <div id="grid" dojoType="dojox.Grid" autoWidth="true" autoHeight="true" model="model" structure="structure" elasticView="2"></div>
         
         <p>Grid fits to a sized container by default:</p>
@@ -156 +177 @@
                 <div id="grid2" dojoType="dojox.VirtualGrid" get="get" structure="structure" rowCount="10" elasticView="2"></div>
         </div>
-                
+
+        <p> Grid is autoHeight and autoWidth via markup</p>
+                <div id="grid3" dojoType="dojox.VirtualGrid" autoWidth="true" autoHeight="true" get="get" structure="structure" rowCount="10" elasticView="2"></div>
 </body>
 </html>

dojox/trunk/grid/VirtualGrid.js

@@ -289 +289 @@
 
         // sizing
-        resize: function(){
+        resize: function(dim /* optional resize dimensions */){
                 // summary:
                 //              Update the grid's rendering dimensions and resize it
-                
+                // dim: Object?
+                //              {w: int, h: int, l: int, t: int}
                 // FIXME: If grid is not sized explicitly, sometimes bogus scrollbars 
                 // can appear in our container, which may require an extra call to 'resize'
@@ -315 +316 @@
                         }
                 }
-                if(this.fitTo == "parent"){
+                // if we are given dimensions, size the grid's domNode to those dimensions
+                if(dim){
+                        dojo.contentBox(this.domNode, dim);
+                }else if(this.fitTo == "parent"){
                         var h = dojo._getContentBox(this.domNode.parentNode).h;
                         dojo.marginBox(this.domNode, { h: Math.max(0, h) });
                 }
                 var h = dojo._getContentBox(this.domNode).h;
-                if(h == 0){
+                if(h == 0 && !this.autoHeight){
                         // We need to hide the header, since the Grid is essentially hidden.
                         this.headerNode.style.display = "none";

dojox/trunk/grid/_grid/Grid.css

@@ -5 +5 @@
         -moz-outline-style: none;
         outline: none;
+        height: 0;
 }
 

dojox/trunk/grid/_grid/tundraGrid.css

@@ -5 +5 @@
         -moz-outline-style: none;
         outline: none;
+        height: 0;
 }