Grid: added heightStyle option, defaults to auto so grid grows and sh…

…rinks to fit rows as they're added and removed.
jquery · Sep 29, 2011 · 1554074 · 1554074
1 parent 683ed79
commit 1554074
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/grid-spf/grid.html b/grid-spf/grid.html
@@ -86,6 +86,7 @@
 		});
 
 		$( "#developers-local" ).grid({
+			heightStyle: "fill",
 			source: developers.result,
 			select: function( event, ui ) {
 				console.log( "Selected " + ui.item.firstName );

diff --git a/ui/jquery.ui.grid.js b/ui/jquery.ui.grid.js
@@ -13,8 +13,9 @@
 $.widget( "ui.grid", {
 
 	options: {
-		dataFields: [ "type", "editor", "editorOptions", "template", "culture", "format" ],
 		columns: null,
+		dataFields: [ "type", "editor", "editorOptions", "template", "culture", "format" ],
+		heightStyle: "auto",
 		rowTemplate: null
 	},
 
@@ -200,8 +201,10 @@ $.widget( "ui.grid", {
 			this.uiGrid.removeClass( "ui-grid-resizable" );
 		}
 
-		// Adjust body height to fill
-		this.uiGridBody.height( gridHeight - headHeight - footHeight );
+		if ( this.options.heightStyle === "fill" ) {
+			// Adjust body height to fill
+			this.uiGridBody.height( gridHeight - headHeight - footHeight );
+		}
 
 		// Adjust head and foot in case of visible scrollbar on body to keep columns aligned
 		var paddingRight,