chore(release): 1.0.0-alpha.5 distribution files

CHANGELOG.md

@@ -1,3 +1,18 @@
+<a name="1.0.0-alpha.5"></a>
+# 1.0.0-alpha.5 (2015-08-16)
+
+
+## Features
+
+- **NgTableParams:** set sensible defaults for filterComparator, filterFn and filterName
+ ([fc2fa182](https://github.com/esvit/ng-table/commit/fc2fa182c57bcb47ea036d78c891aedb1a64bd50))
+- **ngTableDefaultGetData:**
+ - support filterComparator, filterFilterName override, and filterFn
+ ([a62754c9](https://github.com/esvit/ng-table/commit/a62754c9b61ee5543a52098d955a17d586f0620e))
+ - support nested property filters
+ ([58ee04a6](https://github.com/esvit/ng-table/commit/58ee04a6dc3da223616b85c8ad3b0c78ec4fd0d6))
+
+
 <a name="1.0.0-alpha.4"></a>
 # 1.0.0-alpha.4 (2015-08-15)
 

DeleteNodeModules.bat

@@ -0,0 +1,5 @@
+mkdir empty_dir
+robocopy empty_dir .\node_modules_old /s /mir
+rmdir empty_dir
+rmdir .\node_modules_old
+PAUSE

bower.json

@@ -1,6 +1,6 @@
 {
  "name": "ng-table",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
  "main": [
  "./dist/ng-table.min.js",
  "./dist/ng-table.min.css"

dist/ng-table.js

@@ -290,18 +290,57 @@
 
  return getData;
 
+ function getFilterFn(params) {
+ var settings = params.settings();
+ if (angular.isFunction(settings.filterFn)){
+ return settings.filterFn;
+ } else {
+ return $filter(settings.filterFilterName || provider.filterFilterName);
+ }
+ }
+
+ function applyFilter(data, params) {
+ var filter = params.filter(true);
+ var filterKeys = Object.keys(filter);
+ var parsedFilter = filterKeys.reduce(function(result, key){
+ result = setPath(result, filter[key], key);
+ return result;
+ }, {});
+ return getFilterFn(params)(data, parsedFilter, params.settings().filterComparator);
+ }
+
  function getData(data, params) {
  if (data == null){
  return [];
  }
 
- var fData = params.hasFilter() ? $filter(provider.filterFilterName)(data, params.filter(true)) : data;
+ var fData = params.hasFilter() ? applyFilter(data, params) : data;
  var orderBy = params.orderBy();
  var orderedData = orderBy.length ? $filter(provider.sortingFilterName)(fData, orderBy) : fData;
  var pagedData = orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count());
  params.total(orderedData.length); // set total for recalc pagination
  return pagedData;
  }
+
+ // Sets the value at any depth in a nested object based on the path
+ // note: adapted from: underscore-contrib#setPath
+ function setPath(obj, value, path) {
+ var keys = path.split('.');
+ var ret = obj;
+ var lastKey = keys[keys.length -1];
+ var target = ret;
+
+ var parentPathKeys = keys.slice(0, keys.length -1);
+ parentPathKeys.forEach(function(key) {
+ if (!target.hasOwnProperty(key)) {
+ target[key] = {};
+ }
+ target = target[key];
+ });
+
+ target[lastKey] = value;
+ return ret;
+ }
  }
  }
 })();
@@ -998,7 +1037,10 @@
  data: null, //allows data to be set when table is initialized
  total: 0,
  defaultSort: 'desc',
+ filterComparator: undefined, // look for a substring match in case insensitive way
  filterDelay: 750,
+ filterFilterName: undefined, // when defined overrides ngTableDefaultGetDataProvider.filterFilterName
+ filterFn: undefined, // when defined overrides the filter function that ngTableDefaultGetData uses
  filterLayout: 'stack', // alternative: 'horizontal'
  counts: [10, 25, 50, 100],
  interceptors: [],

package.json

@@ -1,6 +1,6 @@
 {
  "name": "ng-table",
- "version": "1.0.0-alpha.4",
+ "version": "1.0.0-alpha.5",
  "author": "Vitalii Savchuk <[email protected]>",
  "license": "BSD",
  "repository": {