Learn how to defer things...

Author: Nicholas Thomson

app/scripts/controllers/crunchinator.js

@@ -67,26 +67,30 @@ angular.module('crunchinatorApp.controllers')
         //Bind component data services to the scope, so we can use them in the views
         $scope.ComponentData = ComponentData;
 
-        var deferred = $q.defer();
-        function applyFilters() {
-            _.delay(function(){
-                $scope.$apply(function() {
-                    Company.runFilters(filterData);
-                    Category.runFilters(filterData);
-                    Investor.runFilters(filterData);
 
-                    deferred.resolve('Finished filters');
-                });
-            }, 300);
-
-            return deferred.promise;
-        }
 
         //All of our filters broadcast 'filterAction' when they've been operated on
         //When a filter receives input we set up filterData and run each model's filters
         //This should automatically update all the graph displays
         $scope.$on('filterAction', function() {
+
+            var deferred = $q.defer();
+            function applyFilters() {
+                _.delay(function(){
+                    $scope.$apply(function() {
+                        Company.runFilters(filterData);
+                        Category.runFilters(filterData);
+                        Investor.runFilters(filterData);
+
+                        deferred.resolve('Finished filters');
+                    });
+                }, 250);
+
+                return deferred.promise;
+            }
+
             $scope.loading = true;
+
             filterData.categoryIds = _.pluck($scope.selectedCategories, 'id');
             filterData.companyIds = _.pluck($scope.selectedCompanies, 'id');
             filterData.investorIds = _.pluck($scope.selectedInvestors, 'id');

app/scripts/services/model.js

@@ -98,8 +98,8 @@ angular.module('crunchinatorApp.models').service('Model', function($rootScope, $
     * @return {boolean} whether the number list contains a value within the range
     */
     Model.prototype.fallsWithinRange = function(items, range) {
-        if(items.length === 0) { return false; }
         if(range.length === 0) { return true; }
+        if(items.length === 0) { return false; }
 
 
         for(var i = 0; i < items.length; i++) {