Merge 500f631 into 57a86a4

sbp-archive · Nov 2, 2015 · fe1366f · fe1366f
2 parents 57a86a4 + 500f631
commit fe1366f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "anglue",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "authors": [
     "Tommy Maintz <tommy.maintz@gmail.com>"
   ],

diff --git a/dist/amd/behaviors/filterable-store.js b/dist/amd/behaviors/filterable-store.js
diff --git a/dist/amd/behaviors/filterable-store.js.map b/dist/amd/behaviors/filterable-store.js.map
diff --git a/src/behaviors/filterable-store.js b/src/behaviors/filterable-store.js
@@ -17,6 +17,7 @@ export class FilterableStoreBehavior extends Behavior {
   constructor(instance, {collection, transformerWeight} = {}) {
     super(...arguments);
 
+    this.searchText = null;
     this.collection = collection || 'items';
     this.transformerWeight = transformerWeight || 25;
     this.filters = new Map();
@@ -49,11 +50,15 @@ export class FilterableStoreBehavior extends Behavior {
     this.doFilter();
   }
 
-  onChangeSearch(expression) {
-    this.onChangeFilter('__search', expression);
+  onChangeSearch(searchText) {
+    if (angular.isString(searchText) && searchText.trim().length > 0) {
+      this.searchText = searchText.trim();
+      this.onChangeFilter('__search', searchText);
+    }
   }
 
   onClearSearch() {
+    this.searchText = null;
     this.onClearFilter('__search');
   }
 
@@ -112,7 +117,8 @@ export function FilterableStore(config) {
         `${changeFilterHandlerName}:onChangeFilter`,
         `${clearFilterHandlerName}:onClearFilter`,
         `${changeSearchHandlerName}:onChangeSearch`,
-        `${clearSearchHandlerName}:onClearSearch`
+        `${clearSearchHandlerName}:onClearSearch`,
+        'searchText'
       ]
     });
   };