Merge branch 'angular_refactor' of github.com:cloudspace/angular.crunchinator.com into angular_refactor

Author: Nicholas Thomson

app/scripts/controllers/crunchinator.js

@@ -26,7 +26,7 @@ angular.module('crunchinatorApp.controllers')
     $scope.investors = Investor;
     $scope.categories = Category;
 
-    Company.fetch().then(function() { 
+    Company.fetch().then(function() {
         Company.setupDimensions();
         Company.runFilters(filterData);
     });

app/scripts/services/category.js

@@ -14,13 +14,13 @@ angular.module('crunchinatorApp.models').service('Category', function(Model, API
     Category.prototype.setupDimensions = function() {
         var crossCategories = crossfilter(this.all);
 
-        this.dimensions = { 
+        this.dimensions = {
             'byId': crossCategories.dimension(function(category) { return category.id; }),
-            'byCompanies': crossCategories.dimension(function(category) { return category.company_ids }),
-            'byInvestors': crossCategories.dimension(function(category) { return category.investor_ids })
+            'byCompanies': crossCategories.dimension(function(category) { return category.company_ids; }),
+            'byInvestors': crossCategories.dimension(function(category) { return category.investor_ids; })
         };
 
-        this.categoriesByName = crossCategories.dimension(function(category) { return category.name });
+        this.categoriesByName = crossCategories.dimension(function(category) { return category.name; });
     };
 
     Category.prototype.filterGroups = {
@@ -53,7 +53,7 @@ angular.module('crunchinatorApp.models').service('Category', function(Model, API
                 return (ids.length === 0 || ids.indexOf(id) > -1);
             });
         }
-    }; 
+    };
 
     return new Category();
 });

app/scripts/services/investor.js

@@ -16,13 +16,13 @@ angular.module('crunchinatorApp.models').service('Investor', function(Model, API
     Investor.prototype.setupDimensions = function() {
         var crossInvestors = crossfilter(this.all);
 
-        this.dimensions = { 
+        this.dimensions = {
             'byId': crossInvestors.dimension(function(investor) { return investor.id; }),
-            'byCompanies': crossInvestors.dimension(function(investor) { return investor.invested_company_ids }),
-            'byCategories': crossInvestors.dimension(function(investor) { return investor.invested_category_ids })
+            'byCompanies': crossInvestors.dimension(function(investor) { return investor.invested_company_ids; }),
+            'byCategories': crossInvestors.dimension(function(investor) { return investor.invested_category_ids; })
         };
 
-        this.investorsByName = crossInvestors.dimension(function(investor) { return investor.name });
+        this.investorsByName = crossInvestors.dimension(function(investor) { return investor.name; });
     };
 
     Investor.prototype.filterGroups = {
@@ -55,7 +55,7 @@ angular.module('crunchinatorApp.models').service('Investor', function(Model, API
                 return (ids.length === 0 || ids.indexOf(id) > -1);
             });
         }
-    }; 
+    };
 
     return new Investor();
 });

app/scripts/services/model.js

@@ -9,7 +9,6 @@ angular.module('crunchinatorApp.models').service('Model', function($rootScope, $
     Model.prototype.fetch = function() {
         var self = this;
         var url = self.url;
-        var parse = self.parse;
 
         if (!url) { throw new Error('You must specify a url on the class'); }
         return $http.get(url).success(function(response) { self.all = self.parse(response); });
@@ -22,26 +21,26 @@ angular.module('crunchinatorApp.models').service('Model', function($rootScope, $
     Model.prototype.resetAllDimensions = function() {
         _.each(this.dimensions, function (dimension) {
             dimension.filterAll();
-        }); 
+        });
     };
 
     Model.prototype.runFilters = function(filterData) {
         var self = this;
         this.filterData = filterData;
-        _.each(this.filterGroups, function(filterGroupFunction, name) {
+        _.each(this.filterGroups, function(filterGroupFunction) {
             filterGroupFunction.bind(self)();
         });
     };
 
     Model.prototype.applyFilters = function(exclusions) {
         var self = this;
-        var exclusions = exclusions || [];
+        exclusions = exclusions || [];
         _.each(this.filters, function(filterFunction, filterName) {
             if(!_.contains(exclusions, filterName)) {
                 filterFunction.bind(self)();
             }
         });
-    }
+    };
 
     return new Model();
 });