Merge pull request #28 from aidanhs/unique-filter-object-subkeys

Fix unique filter on object subkeys

Author: ProLoser

modules/unique/test/uniqueSpec.js

@@ -54,6 +54,18 @@ describe('unique', function () {
     ]);
   });
 
+  it('should return unique entries based on the subkey provided for complex objects', function () {
+    var arrayToFilter = [
+      {key: 'value', other: {subkey: 'sub1'}},
+      {key: 'value', other: {subkey: 'sub2'}},
+      {key: 'value2', other: {subkey: 'sub1'}}
+    ];
+    expect(uniqueFilter(arrayToFilter, 'other.subkey')).toEqual([
+      {key: 'value', other: {subkey: 'sub1'}},
+      {key: 'value', other: {subkey: 'sub2'}}
+    ]);
+  });
+
   it('should return unique primitives in arrays', function () {
     expect(uniqueFilter([1, 2, 1, 3])).toEqual([1, 2, 3]);
   });

modules/unique/unique.js

@@ -5,7 +5,7 @@
  if the key === false then no filtering will be performed
  * @return {array}
  */
-angular.module('ui.unique',[]).filter('unique', function () {
+angular.module('ui.unique',[]).filter('unique', ['$parse', function ($parse) {
 
   return function (items, filterOn) {
 
@@ -14,14 +14,11 @@ angular.module('ui.unique',[]).filter('unique', function () {
     }
 
     if ((filterOn || angular.isUndefined(filterOn)) && angular.isArray(items)) {
-      var hashCheck = {}, newItems = [];
+      var hashCheck = {}, newItems = [],
+        get = angular.isString(filterOn) ? $parse(filterOn) : function (item) { return item; };
 
       var extractValueToCompare = function (item) {
-        if (angular.isObject(item) && angular.isString(filterOn)) {
-          return item[filterOn];
-        } else {
-          return item;
-        }
+        return angular.isObject(item) ? get(item) : item;
       };
 
       angular.forEach(items, function (item) {
@@ -42,4 +39,4 @@ angular.module('ui.unique',[]).filter('unique', function () {
     }
     return items;
   };
-});
+}]);