Fix SitePen#664: Allow blank labels (specified as empty string)

CHANGES.md

@@ -13,6 +13,8 @@ This document outlines changes since 0.3.0.  For older changelogs, see the
   after scrolling. (#548)
 * Added the capability to opt out of custom TouchScroll logic on devices that
   support touch, by setting `useTouchScroll: false` on the instance. (#656)
+* Fixed logic in `Grid`, `GridFromHtml`, and `selector` to allow specifying a
+  blank label for a column by passing an empty string to `column.label`. (#664)
 
 ### Mixins
 

Grid.js

@@ -196,8 +196,9 @@ function(kernel, declare, listen, has, put, List, miscUtil){
 				// allow for custom header content manipulation
 				if(column.renderHeaderCell){
 					appendIfNode(contentNode, column.renderHeaderCell(contentNode));
-				}else if(column.label || column.field){
-					contentNode.appendChild(document.createTextNode(column.label || column.field));
+				}else if("label" in column || column.field){
+					contentNode.appendChild(document.createTextNode(
+						"label" in column ? column.label : column.field));
 				}
 				if(column.sortable !== false && field && field != "_item"){
 					th.sortable = true;

GridFromHtml.js

@@ -114,7 +114,7 @@ function(Grid, declare, put){
 			obj = GridFromHtml.utils.getPropsFromNode(th);
 
 			// inspect standard attributes, but data attribute takes precedence
-			obj.label = obj.label || th.innerHTML;
+			obj.label = "label" in obj ? obj.label : th.innerHTML;
 			obj.field = obj.field || th.className || th.innerHTML;
 			if(!obj.className && th.className){ obj.className = th.className; }
 			if(!obj.rowSpan && (tmp = getNum(th, "rowspan"))){ obj.rowSpan = tmp; }

selector.js

@@ -182,7 +182,8 @@ function(kernel, arrayUtil, on, aspect, has, put){
 			renderInput(value, cell, object);
 		};
 		column.renderHeaderCell = function(th){
-			var label = column.label || column.field || "";
+			var label = "label" in column ? column.label :
+				column.field || "";
 
 			if(type == "radio" || !grid.allowSelectAll){
 				th.appendChild(document.createTextNode(label));

test/GridFromHtml.html

@@ -112,13 +112,13 @@ <h2>1a: GridFromHtml with single column with formatter for _item field</h2>
 				</tr>
 			</thead>
 		</table>
-		<h2>1b: GridFromHtml with single column with get for order field</h2>
+		<h2>1b: GridFromHtml with single column with get for order field, and blank label for 3rd column</h2>
 		<table id="gridFromHtmlLegacyGet">
 			<tbody>
 				<tr>
 					<th data-dgrid-column="{field:'order', get:testGet}">Step</th>
 					<th>name</th>
-					<th data-dgrid-column="{field:'description', sortable:false}">what to do</th>
+					<th data-dgrid-column="{label:'', field:'description', sortable:false}">what to do</th>
 				</tr>
 			</tbody>
 		</table>

test/Grid_rendering.html

@@ -103,7 +103,7 @@
 					renderCell: testRenderCell
 				},
 				name: {},
-				description: {label: "what to do", sortable: false}
+				description: {label: "", sortable: false} // Test blank label
 			};
 			require(["dgrid/Grid", "dgrid/OnDemandGrid", "dojo/store/Memory", "dojo/store/Observable", "dojo/_base/declare", "dojo/_base/lang", "dojo/parser", "dojo/query", "dgrid/test/data/base", "dojo/domReady!"],
 			function(Grid, OnDemandGrid, Memory, Observable, declare, lang, parser, query){

test/selector.html

@@ -73,7 +73,7 @@
 						store: testStore,
 						selectionMode: "none",
 						columns: {
-							col1: selector({ label: "Select" }),
+							col1: selector({ label: "" }), // Test blank label
 							id: "ID",
 							col2: {label: 'Column 2', sortable: false},
 							col3: {label: 'Column 3'}
@@ -149,7 +149,7 @@ <h2>A grid with radio selectors</h2>
 				Set selection mode to "single" (to test sync)</button>
 		</div>
 		<div id="grid-radio"></div>
-		<h2>A grid with checkbox selectors, with select-all disabled</h2>
+		<h2>A grid with checkbox selectors, with select-all disabled, blank label in selector column</h2>
 		<div id="grid2"></div>
 		<h2>A grid, initially without a selector column</h2>
 		<div id="gridNoSelector"></div>