Update search.js for charcoal-core 0.3

To use conjoined filters as search query.
locomotivemtl · Nov 22, 2017 · 0b47a55 · 0b47a55
1 parent 8925996
commit 0b47a55
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/assets/dist/scripts/charcoal.admin.js b/assets/dist/scripts/charcoal.admin.js
@@ -3558,7 +3558,7 @@ Charcoal.Admin.Widget_Search.prototype.dispatch = function (widget)
         widget.pagination.page = 1;
     }
 
-    var $input, words, props, filters = [];
+    var $input, words, props, query, filters = [];
 
     $input = this.element().find('input');
     words  = $input.val().split(/\s/);
@@ -3569,13 +3569,17 @@ Charcoal.Admin.Widget_Search.prototype.dispatch = function (widget)
             filters.push({
                 property: prop,
                 operator: 'LIKE',
-                value:    ('%' + word + '%'),
-                operand:  'OR'
+                value:    ('%' + word + '%')
             });
         });
     });
 
-    widget.set_filters(filters);
+    query = {
+        conjunction: 'OR',
+        filters: filters
+    };
+
+    widget.set_filters([ query ]);
 
     // widget.add_search(val, props);