Merge branch 'master' into width-style

* master:
  [FEATURE] `multiSelectRequiresKeyboard` option for toggling row
selection without ctrl/cmd (#160)
  chore(package): update ember-cli-blanket to version 0.9.9 (#162)

# Conflicts:
#	package.json

addon/components/lt-body.js

@@ -100,6 +100,19 @@ export default Component.extend({
    */
   multiSelect: false,
 
+  /**
+   * When multiSelect is true, this property determines whether or not `ctrl`
+   * (or `cmd`) is required to select additional rows, one by one. When false,
+   * simply clicking on subsequent rows will select or deselect them.
+   *
+   * `shift` to select many consecutive rows is unaffected by this property.
+   *
+   * @property multiSelectRequiresKeyboard
+   * @type {Boolean}
+   * @default true
+   */
+  multiSelectRequiresKeyboard: true,
+
   /**
    * Hide scrollbar when not scrolling
    *
@@ -206,6 +219,7 @@ export default Component.extend({
     onRowClick(row, e) {
       let rows = this.get('table.rows');
       let multiSelect = this.get('multiSelect');
+      let multiSelectRequiresKeyboard = this.get('multiSelectRequiresKeyboard');
       let canSelect = this.get('canSelect');
       let isSelected = row.get('selected');
       let currIndex = rows.indexOf(row);
@@ -218,7 +232,7 @@ export default Component.extend({
         if (e.shiftKey && multiSelect) {
           rows.slice(Math.min(currIndex, prevIndex), Math.max(currIndex, prevIndex) + 1).forEach(r => r.set('selected', !isSelected));
           this._prevSelectedIndex = currIndex;
-        } else if ((e.ctrlKey || e.metaKey) && multiSelect) {
+        } else if ((!multiSelectRequiresKeyboard || (e.ctrlKey || e.metaKey)) && multiSelect) {
           row.toggleProperty('selected');
         } else {
           this.get('table.selectedRows').setEach('selected', false);

package.json

@@ -27,7 +27,7 @@
     "ember-cli": "2.6.3",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-autoprefixer": "0.6.0",
-    "ember-cli-blanket": "0.9.8",
+    "ember-cli-blanket": "0.9.9",
     "ember-cli-changelog": "0.3.4",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-es5-shim": "0.3.0",

tests/integration/components/lt-body-test.js

@@ -24,7 +24,7 @@ test('it renders', function(assert) {
   assert.equal(this.$().text().trim(), '');
 });
 
-test('row selection', function(assert) {
+test('row selection - enable or disable', function(assert) {
   this.set('table', new Table(Columns, createUsers(1)));
   this.set('canSelect', false);
 
@@ -45,7 +45,7 @@ test('row selection', function(assert) {
   assert.ok(row.hasClass('is-selected'));
 });
 
-test('row selection', function(assert) {
+test('row selection - ctrl-click to modify selection', function(assert) {
   this.set('table', new Table(Columns, createUsers(5)));
 
   this.render(hbs `{{lt-body table=table sharedOptions=sharedOptions canSelect=true multiSelect=true}}`);
@@ -57,16 +57,40 @@ test('row selection', function(assert) {
   assert.equal(this.$('tbody > tr').length, 5);
 
   firstRow.click();
-  assert.equal(this.$('tr.is-selected').length, 1);
+  assert.equal(this.$('tr.is-selected').length, 1, 'clicking a row selects it');
 
   lastRow.trigger(createClickEvent({shiftKey: true}));
-  assert.equal(this.$('tr.is-selected').length, 5);
+  assert.equal(this.$('tr.is-selected').length, 5, 'shift-clicking another row selects it and all rows between');
 
   middleRow.trigger(createClickEvent({ctrlKey: true}));
-  assert.equal(this.$('tr.is-selected').length, 4);
+  assert.equal(this.$('tr.is-selected').length, 4, 'ctrl-clicking a selected row deselects it');
 
   firstRow.click();
-  assert.equal(this.$('tr.is-selected').length, 0);
+  assert.equal(this.$('tr.is-selected').length, 0, 'clicking a selected row deselects all rows');
+});
+
+test('row selection - click to modify selection', function(assert) {
+  this.set('table', new Table(Columns, createUsers(5)));
+
+  this.render(hbs `{{lt-body table=table sharedOptions=sharedOptions canSelect=true multiSelect=true multiSelectRequiresKeyboard=false}}`);
+
+  let firstRow = this.$('tr:first');
+  let middleRow = this.$('tr:nth-of-type(3)');
+  let lastRow = this.$('tr:last');
+
+  assert.equal(this.$('tbody > tr').length, 5);
+
+  firstRow.click();
+  assert.equal(this.$('tr.is-selected').length, 1, 'clicking a row selects it');
+
+  lastRow.trigger(createClickEvent({shiftKey: true}));
+  assert.equal(this.$('tr.is-selected').length, 5, 'shift-clicking another row selects it and all rows between');
+
+  middleRow.click();
+  assert.equal(this.$('tr.is-selected').length, 4, 'clicking a selected row deselects it without affecting other selected rows');
+
+  middleRow.click();
+  assert.equal(this.$('tr.is-selected').length, 5, 'clicking a deselected row selects it without affecting other selected rows');
 });
 
 test('row expansion', function(assert) {