fixup code cleanup

WikiWatershed · Sep 15, 2017 · e979ba5 · e979ba5
1 parent 86d9c8c
commit e979ba5
Showing 1 changed file with 20 additions and 33 deletions.
diff --git a/src/mmw/js/src/data_catalog/models.js b/src/mmw/js/src/data_catalog/models.js
@@ -23,7 +23,7 @@ var FilterModel = Backbone.Model.extend({
     },
 
     validate: function() {
-        _.noop();
+        return true;
     },
 
     isActive: function() {
@@ -34,36 +34,30 @@ var FilterModel = Backbone.Model.extend({
 });
 
 var SearchOption = FilterModel.extend({
-    defaults: function() {
-        return _.extend(FilterModel.prototype.defaults, {
-            active: false
-        });
-    },
+    defaults: _.defaults({
+        active: false,
+    }, FilterModel.prototype.defaults),
 
     isActive: function() {
         return this.get('active');
     }
 });
 
 var GriddedServicesFilter = SearchOption.extend({
-    defaults: function() {
-        return _.extend(SearchOption.prototype.defaults(), {
-            id: 'gridded',
-            type: 'checkbox',
-            label: 'Gridded Services',
-        });
-    },
+    defaults: _.defaults({
+        id: 'gridded',
+        type: 'checkbox',
+        label: 'Gridded Services',
+    }, SearchOption.prototype.defaults)
 });
 
 var DateFilter = FilterModel.extend({
-    defaults: function() {
-        return _.extend(FilterModel.prototype.defaults, {
-            id: 'date',
-            type: 'date',
-            fromDate: null,
-            toDate: null,
-        });
-    },
+    defaults: _.defaults({
+        id: 'date',
+        type: 'date',
+        fromDate: null,
+        toDate: null,
+    }, FilterModel.prototype.defaults),
 
     isActive: function() {
         return this.get('fromDate') || this.get('toDate');
@@ -99,11 +93,9 @@ var FilterCollection = Backbone.Collection.extend({
     model: FilterModel,
 
     countActive: function() {
-        var incrementIfActive = function(count, filter) {
-            return filter.isActive() ? ++count : count;
-        };
+        var isActive = function(filter) { return filter.isActive(); };
 
-        return this.reduce(incrementIfActive, 0);
+        return this.filter(isActive).length;
     },
 });
 
@@ -176,15 +168,10 @@ var Catalog = Backbone.Model.extend({
 
     isSearchValid: function() {
         var query = this.get('query'),
-            dateFilter = this.get('filters').findWhere({ id: 'date'}),
-            dateFilterValid = true;
-
-        if (dateFilter) {
-            dateFilter.validate();
-            dateFilterValid = dateFilter.get('isValid');
-        }
+            validate = function(filter) { return filter.validate(); },
+            valid = this.get('filters').map(validate);
 
-        return query && dateFilterValid;
+        return query && _.every(valid);
     },
 
     startSearch: function(page) {