Selector: fix dojo#731 double selection

Selector.js

@@ -80,6 +80,20 @@ define([
 		},
 
 		_handleSelectorClick: function (event) {
+			// Prevent this handler from running twice for a single event.
+			// In some cases pressing SPACE or ENTER will also trigger a 'click' event. When a 'click' event originates
+			// from an actual mouse click, the 'event.detail' property contains the number of mouse clicks, which is 1
+			// or more. When a 'click' event originates from a keyboard event, 'event.detail' is 0 since there were no
+			// actual mouse clicks involved.
+			if (event.type === 'click' && event.detail === 0) {
+				// If the input (checkbox/radio) is the focused element (as opposed to the '.dgrid-selector' table cell)
+				// then the default event action is to change its selection state, which we want to prevent.
+				// (Otherwise you end up in the state where the input element's checked state is the opposite of the
+				// row's selected state.)
+				event.preventDefault();
+				return;
+			}
+
 			var cell = this.cell(event);
 			var row = cell.row;
 
@@ -216,4 +230,4 @@ define([
 			}
 		}
 	});
-});
+});

test/intern/functional/Selector.js

@@ -192,5 +192,40 @@ define([
 			createRowSelectionTest('gridToggle', true, selectAll));
 		test.test('select all; selectionMode: none',
 			createRowSelectionTest('gridNone', true, selectAll));
+
+		test.test('keyboard selection on input element', function () {
+			function getSelectionState (id) {
+				return gridExtended.selection[id];
+			}
+
+			return this.get('remote')
+				.findByCssSelector('#gridExtended-row-0 input')
+					.click()
+					.execute(getSelectionState, ['0'])
+					.then(function (selectionState) {
+						assert.isTrue(selectionState, 'Clicked row should be selected');
+					})
+					.type(keys.ENTER)
+					.execute(getSelectionState, ['0'])
+					.then(function (selectionState) {
+						assert.notOk(selectionState, 'Press Enter: row should not be selected');
+					})
+					.type(keys.ENTER)
+					.execute(getSelectionState, ['0'])
+					.then(function (selectionState) {
+						assert.isTrue(selectionState, 'Press Enter: row should be selected');
+					})
+					.type(keys.SPACE)
+					.execute(getSelectionState, ['0'])
+					.then(function (selectionState) {
+						assert.notOk(selectionState, 'Press Space: row should not be selected');
+					})
+					.type(keys.SPACE)
+					.execute(getSelectionState, ['0'])
+					.then(function (selectionState) {
+						assert.isTrue(selectionState, 'Press Space: row should be selected');
+					})
+				.end();
+		});
 	});
-});
+});