fix #165

lorenzofox3 · Sep 11, 2014 · 03185a6 · 03185a6
1 parent 984e657
commit 03185a6
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 28 deletions.
diff --git a/dist/smart-table.debug.js b/dist/smart-table.debug.js
@@ -109,11 +109,11 @@
                 var index = rows.indexOf(row);
                 if (index !== -1) {
                     if (mode === 'single') {
-                        row.isSelected = true;
+                        row.isSelected = row.isSelected !== true;
                         if (lastSelected) {
                             lastSelected.isSelected = false;
                         }
-                        lastSelected = row;
+                        lastSelected = row.isSelected === true ? row : undefined;
                     } else {
                         rows[index].isSelected = !rows[index].isSelected;
                     }

diff --git a/dist/smart-table.min.js b/dist/smart-table.min.js
diff --git a/src/stTable.js b/src/stTable.js
@@ -104,11 +104,11 @@
                 var index = rows.indexOf(row);
                 if (index !== -1) {
                     if (mode === 'single') {
-                        row.isSelected = true;
+                        row.isSelected = row.isSelected !== true;
                         if (lastSelected) {
                             lastSelected.isSelected = false;
                         }
-                        lastSelected = row;
+                        lastSelected = row.isSelected === true ? row : undefined;
                     } else {
                         rows[index].isSelected = !rows[index].isSelected;
                     }

diff --git a/test/spec/stTable.spec.js b/test/spec/stTable.spec.js
@@ -90,7 +90,7 @@ describe('st table Controller', function () {
                 {name: 'Faivre', firstname: 'Blandine', age: 44}
             ]);
 
-            ctrl.search('','name');
+            ctrl.search('', 'name');
 
             expect(scope.data).toEqual([
                 {name: null, firstname: 'Laurent', age: 66},
@@ -206,64 +206,76 @@ describe('st table Controller', function () {
     });
 
     describe('select', function () {
-        it('should select only a single row at the tiem', function () {
-            ctrl.select(scope.data[3], 'single');
-            var selected = scope.data.filter(function (value) {
-                return value.isSelected === true;
+
+        function getSelected(array) {
+            return array.filter(function (val) {
+                return val.isSelected === true;
             });
+        }
+
+
+        it('should select only a single row at the time', function () {
+            ctrl.select(scope.data[3], 'single');
+            var selected = getSelected(scope.data);
             expect(selected.length).toBe(1);
             expect(selected[0]).toEqual(scope.data[3]);
 
             ctrl.select(scope.data[2], 'single');
 
-            selected = scope.data.filter(function (value) {
-                return value.isSelected === true;
-            });
+            selected = getSelected(scope.data);
 
             expect(selected.length).toBe(1);
             expect(selected[0]).toEqual(scope.data[2]);
         });
 
+        it('should select a row multiple times in single mode (#165)', function () {
+            ctrl.select(scope.data[3], 'single');
+            var selected = getSelected(scope.data);
+            expect(selected.length).toBe(1);
+            expect(selected[0]).toEqual(scope.data[3]);
+
+            ctrl.select(scope.data[3], 'single');
+            selected = getSelected(scope.data);
+
+            expect(selected.length).toBe(0);
+
+            ctrl.select(scope.data[3], 'single');
+            selected = getSelected(scope.data);
+
+            expect(selected.length).toBe(1);
+            expect(selected[0]).toEqual(scope.data[3]);
+        });
+
         it('should select multiple row', function () {
             ctrl.select(scope.data[3]);
             ctrl.select(scope.data[4]);
-            var selected = scope.data.filter(function (val) {
-                return val.isSelected === true;
-            });
+            var selected = getSelected(scope.data);
             expect(selected.length).toBe(2);
             expect(selected).toEqual([scope.data[3], scope.data[4]]);
         });
 
         it('should unselect an item on mode single', function () {
             ctrl.select(scope.data[3], 'single');
-            var selected = scope.data.filter(function (value) {
-                return value.isSelected === true;
-            });
+            var selected = getSelected(scope.data);
             expect(selected.length).toBe(1);
             expect(selected[0]).toEqual(scope.data[3]);
 
             ctrl.select(scope.data[3], 'single');
 
-            selected = scope.data.filter(function (value) {
-                return value.isSelected === true;
-            });
+            selected = getSelected(scope.data);
 
             expect(selected.length).toBe(0);
         });
 
         it('should unselect an item on mode multiple', function () {
             ctrl.select(scope.data[3]);
             ctrl.select(scope.data[4]);
-            var selected = scope.data.filter(function (val) {
-                return val.isSelected === true;
-            });
+            var selected = getSelected(scope.data);
             expect(selected.length).toBe(2);
             expect(selected).toEqual([scope.data[3], scope.data[4]]);
 
             ctrl.select(scope.data[3]);
-            selected = scope.data.filter(function (val) {
-                return val.isSelected === true;
-            });
+            selected = getSelected(scope.data);
             expect(selected.length).toBe(1);
             expect(selected).toEqual([scope.data[4]]);
         });