v2.4.0

SimpliField · Mar 19, 2020 · 8aef0a3 · 8aef0a3
1 parent d096251
commit 8aef0a3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/angular-sql-query.js b/angular-sql-query.js
@@ -773,12 +773,28 @@
         var resourceValue = path(filterPath, resource);
         var filterValue = filtersParams[filterKey];
 
-        return angular.isArray(filterValue) ? filterValue.some(function (value) {
-          return angular.equals(value, resourceValue);
-        }) // In for array
-        : angular.isArray(resourceValue) ? resourceValue.some(function (value) {
-          return angular.equals(value, filterValue);
-        }) : angular.equals(filterValue, resourceValue); // Equal for single value
+        if (angular.isArray(filterValue) && angular.isArray(resourceValue)) {
+          return filterValue.every(function (filter) {
+            return resourceValue.some(function (value) {
+              return angular.equals(filter, value);
+            });
+          });
+        }
+
+        // In for array
+        if (angular.isArray(filterValue)) {
+          return filterValue.some(function (value) {
+            return angular.equals(value, resourceValue);
+          });
+        }
+
+        if (angular.isArray(resourceValue)) {
+          return resourceValue.some(function (value) {
+            return angular.equals(value, filterValue);
+          });
+        }
+
+        return angular.equals(filterValue, resourceValue); // Equal for single value
       });
     });
   }

diff --git a/angular-sql-query.min.js b/angular-sql-query.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-sql-query",
   "description": "Make simple query on a SQLite database",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "main": "index.js",
   "repository": {
     "type": "git",