support nested search

CyrilLin · Jun 12, 2015 · 45da53c · 45da53c
1 parent 7f8911a
commit 45da53c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-smart-table",
-    "version": "2.0.3",
+    "version": "2.1.0",
     "homepage": "https://github.com/lorenzofox3/Smart-Table",
     "authors": [
         "lorenzofox3 <[email protected]>"

diff --git a/changeLog.md b/changeLog.md
@@ -132,4 +132,11 @@ function(tableState, tableController){
 ## version 2.0.3
 
 * implements #379
-* fix #390
+* fix #390
+
+## version 2.1.0
+
+* support nested search (thanks to @jansabbe)
+* fix #254
+* fix wrong path to default config for stSkipNatural (@phuvo)
+* fix #406
diff --git a/dist/smart-table.js b/dist/smart-table.js
diff --git a/dist/smart-table.min.js b/dist/smart-table.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-smart-table",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "",
   "main": "dist/smart-table.js",
   "scripts": {

diff --git a/test/spec/stSearch.spec.js b/test/spec/stSearch.spec.js
@@ -194,7 +194,6 @@ describe('stSearch Directive', function () {
             scope.$apply();
         }));
 
-
         it('should support binding on search predicate', inject(function ($compile, $timeout) {
             scope.searchPredicate = 'name';
             var ths = element.find('th');
@@ -288,7 +287,7 @@ describe('stSearch Directive', function () {
             input[0].value = 're';
             input.triggerHandler('input');
             $timeout.flush();
-            trs = element.find('tr.test-filtered');
+            var trs = element.find('tr.test-filtered');
             expect(trs.length).toBe(4);
             expect(trToModel(trs)).toEqual([
                 {name: 'Renard', firstname: 'Laurent', age: 66},