Fix linting errors

Gruntfile.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function(grunt) {
   // Project configuration
   grunt.initConfig({
@@ -34,21 +36,23 @@ module.exports = function(grunt) {
         options: {
           globals: {
             JQuery: true,
-            $: true
+            $: true,
+            require: true,
+            define: true,
+            _: true,
+            Backbone: true,
+            Tabletop: true,
+            google: true
           }
         },
         files: {
           src: [
-            'src/scripts/*.js',
-            'src/scripts/entities/*.js',
-            'src/scripts/apps/bills/*.js',
-            'src/scripts/apps/bills/show/*.js',
-            'src/scripts/apps/members/*.js',
-            'src/scripts/apps/members/list/*.js',
-            'src/scripts/apps/members/show/*.js',
-            'src/scripts/apps/watched_bills/*.js',
-            'src/scripts/apps/watched_bills/list/*.js',
-            'src/scripts/apps/watched_bills/show/*.js'
+            'src/scripts/**/*.js',
+            '!src/scripts/build.js',
+            // TODO: Remove built files from `src/` directory
+            '!src/scripts/require_main.built*',
+            '!src/scripts/underscore*',
+            '!src/scripts/lib/**/*'
           ]
         }
       },

src/scripts/app.js

@@ -1,12 +1,14 @@
 define(["marionette"], function(Marionette) {
+  "use strict";
+
   var GeneralAssemblyApp = new Marionette.Application();
 
   GeneralAssemblyApp.addRegions({
     mainRegion: "#main-region"
   });
 
   GeneralAssemblyApp.navigate = function(route, options) {
-    options || (options = {});
+    options  = options || {};
     Backbone.history.navigate(route, options);
   };
 
@@ -23,14 +25,13 @@ define(["marionette"], function(Marionette) {
         //   GeneralAssemblyApp.trigger("welcome:show");
         // }
 
-        var public_spreadsheet_url = 'https://docs.google.com/spreadsheet/pub?key=0Ap9h1zLSgOWUdEhsQi1Yb0JZV3REUVExV1hqT2h6NHc&output=html';
         Tabletop.init({
           key: 'https://docs.google.com/spreadsheet/pub?key=0Ap9h1zLSgOWUdEhsQi1Yb0JZV3REUVExV1hqT2h6NHc&output=html',
           simpleSheet: true,
           proxie: 'https://s3.amazonaws.com/obscure-atoll-3469',
-          callback: function(data, tabletop) {
-            text = {};
-            _.each(data, function(row) { text[row.id] = row.text });
+          callback: function(data) {
+            var text = {};
+            _.each(data, function(row) { text[row.id] = row.text; });
             GeneralAssemblyApp.text = text;
           }
         });

src/scripts/apps/about/about_app.js

@@ -1,5 +1,7 @@
 define(["app"], function(GeneralAssemblyApp) {
-  GeneralAssemblyApp.module("AboutApp", function(AboutApp, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("AboutApp", function(AboutApp, GeneralAssemblyApp, Backbone, Marionette) {
     AboutApp.Router = Marionette.AppRouter.extend({
       appRoutes: {
         "about": "about"

src/scripts/apps/about/about_controller.js

@@ -1,5 +1,7 @@
 define(["app","apps/about/about_view"], function(GeneralAssemblyApp, View) {
-  GeneralAssemblyApp.module("AboutApp", function(AboutApp, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("AboutApp", function(AboutApp, GeneralAssemblyApp) {
     AboutApp.Controler = {
       showAbout: function() {
         var aboutView = new View.AboutView();

src/scripts/apps/about/about_view.js

@@ -1,5 +1,7 @@
 define(["app"], function(GeneralAssemblyApp) {
-  GeneralAssemblyApp.module("AboutApp.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("AboutApp.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $) {
     View.AboutView = Marionette.ItemView.extend({
       template: "#about-template",
       onShow: function() {

src/scripts/apps/bills/bills_app.js

@@ -1,5 +1,7 @@
 define(["app"], function(GeneralAssemblyApp) {
-  GeneralAssemblyApp.module("BillsApp", function(BillsApp, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("BillsApp", function(BillsApp, GeneralAssemblyApp, Backbone, Marionette) {
     BillsApp.Router = Marionette.AppRouter.extend({
       appRoutes: {
         "bills(?:query)": "listBills",
@@ -9,8 +11,9 @@ define(["app"], function(GeneralAssemblyApp) {
     });
 
     var API = {
-      listBills: function(query) {
-        require(["apps/bills/list/list_controller"], function (ListController) {
+      listBills: function() {
+        require(["apps/bills/list/list_controller"], function () {
+          // TODO: Do something with required module?
         });
       },
       showBill: function(id) {

src/scripts/apps/bills/list/list_controller.js

@@ -1,10 +1,14 @@
-define(["app","apps/bills/list/list_view"], function(GeneralAssemblyApp, View) {
-  GeneralAssemblyApp.module("BillsApp.List", function(List, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+// TODO: Remove dependency on "list_view" module if it has no side-effects
+define(["app","apps/bills/list/list_view"], function(GeneralAssemblyApp) {
+  "use strict";
+
+  // TODO: Determine if this is dead code and remove if so.
+  GeneralAssemblyApp.module("BillsApp.List", function(List) {
     List.Controller = {
-      ListBills: function(criterion) {
+      ListBills: function() {
         require(["entities/bills"], function() {
         });
-      };
+      }
     };
   });
   return GeneralAssemblyApp.BillsApp.List.Controller;

src/scripts/apps/bills/list/list_view.js

@@ -1,10 +1,13 @@
 define(["app"], function(GeneralAssemblyApp) {
-  GeneralAssemblyApp.module("BillsApp.List.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $, _) {
-    View.BillView = Marrionette.ItemView,extend({
+  "use strict";
+
+  GeneralAssemblyApp.module("BillsApp.List.View", function(View, GeneralAssemblyApp, Backbone, Marionette) {
+    // TODO: Determine if this is dead code and remove if so.
+    View.BillView = Marionette.ItemView.extend({
       template: "bill-item-template"
     });
 
-    view.BillListView = Marrinonette.CompositView.extend({
+    View.BillListView = Marionette.CompositView.extend({
       template: "bill-search-list-template",
       itemView: View.BillView,
       tagName: "tr",

src/scripts/apps/bills/show/show_controller.js

@@ -1,5 +1,7 @@
 define(["app","apps/bills/show/show_view"], function(GeneralAssemblyApp, View) {
-  GeneralAssemblyApp.module("BillsApp.Show", function(Show, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("BillsApp.Show", function(Show, GeneralAssemblyApp, Backbone, Marionette, $) {
     Show.Controller = {
       showBill: function(param) {
         // param is appended to the end of hte api request url -- it can be
@@ -11,24 +13,24 @@ define(["app","apps/bills/show/show_view"], function(GeneralAssemblyApp, View) {
 
           $.when(fetchingBill).done(function(bill) {
             window.bill = bill;
-            billView = new View.BillView({
+            var billView = new View.BillView({
               model: bill
             });
 
-            author = new GeneralAssemblyApp.Entities.BillAuthors( bill.get("author") );
-            authorView = new View.AuthorsView({ collection: author });
+            var author = new GeneralAssemblyApp.Entities.BillAuthors( bill.get("author") );
+            var authorView = new View.AuthorsView({ collection: author });
 
-            coauthors = new GeneralAssemblyApp.Entities.BillAuthors( bill.get("coauthors") );
-            coauthorsView = new View.AuthorsView({ collection: coauthors });
+            var coauthors = new GeneralAssemblyApp.Entities.BillAuthors( bill.get("coauthors") );
+            var coauthorsView = new View.AuthorsView({ collection: coauthors });
 
-            bill_status_listings = new GeneralAssemblyApp.Entities.BillStatusListings( bill.get("bill_status_listings" ) );
-            stausListingsView = new View.StatusListingsView({ collection: bill_status_listings });
+            var bill_status_listings = new GeneralAssemblyApp.Entities.BillStatusListings( bill.get("bill_status_listings" ) );
+            var stausListingsView = new View.StatusListingsView({ collection: bill_status_listings });
 
-            bill_versions = new GeneralAssemblyApp.Entities.BillVersions( bill.get("versions") );
-            versionListingsView = new View.VersionsListingView({ collection: bill_versions });
+            var bill_versions = new GeneralAssemblyApp.Entities.BillVersions( bill.get("versions") );
+            var versionListingsView = new View.VersionsListingView({ collection: bill_versions });
 
-            bill_votes = new GeneralAssemblyApp.Entities.BillVotes( bill.get("votes") );
-            votesListingsView = new View.VotesListingView({ collection: bill_votes });
+            var bill_votes = new GeneralAssemblyApp.Entities.BillVotes( bill.get("votes") );
+            var votesListingsView = new View.VotesListingView({ collection: bill_votes });
 
             billLayout.on("show", function() {
               billLayout.billRegion.show(billView);

src/scripts/apps/bills/show/show_view.js

@@ -1,5 +1,7 @@
 define(["app"], function(GeneralAssemblyApp) {
-  GeneralAssemblyApp.module("BillsApp.Show.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("BillsApp.Show.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $) {
     View.BillLayout = Marionette.Layout.extend({
       template: "#bill-detail-layout",
       className: "container",
@@ -34,7 +36,7 @@ define(["app"], function(GeneralAssemblyApp) {
         });
 
         if (crossover_status === -1) {
-          var billnum = $(".billnumhed")
+          var billnum = $(".billnumhed");
           $(billnum).addClass("red");
         }
       }
@@ -44,7 +46,7 @@ define(["app"], function(GeneralAssemblyApp) {
     View.AuthorView = Marionette.ItemView.extend({
       tagName: "li",
       className: function() {
-        return "media " + this.model.get("party")
+        return "media " + this.model.get("party");
       },
       template: "#bill-author-template"
     });

src/scripts/apps/members/list/list_controller.js

@@ -1,5 +1,7 @@
 define(["app","apps/members/list/list_view"], function(GeneralAssemblyApp, View) {
-  GeneralAssemblyApp.module("MembersApp.List", function(List, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("MembersApp.List", function(List, GeneralAssemblyApp, Backbone, Marionette, $) {
     List.Controller = {
       listMembers: function(criterion) {
         require(["entities/member"], function() {
@@ -9,7 +11,7 @@ define(["app","apps/members/list/list_view"], function(GeneralAssemblyApp, View)
           var membersListPanel = new View.MemberPanel();
 
           $.when(fetchingMembers).done(function(members) {
-            filteredMembers = GeneralAssemblyApp.Entities.FilteredCollection({
+            var filteredMembers = GeneralAssemblyApp.Entities.FilteredCollection({
               collection: members,
               filterCriterion: criterion
             });

src/scripts/apps/members/list/list_view.js

@@ -1,5 +1,7 @@
 define(["app"], function(GeneralAssemblyApp) {
-  GeneralAssemblyApp.module("MembersApp.List.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("MembersApp.List.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $) {
     View.MemberLayout = Marionette.Layout.extend({
       template: "#member-list-layout",
       regions: {
@@ -63,7 +65,8 @@ define(["app"], function(GeneralAssemblyApp) {
           if ((navPos.top+jumboHeight) < offset){
             $('#panel-region').addClass('fixed');
             $('#members-region').css({'margin-top':'50px'});
-          } if ((navPos.top+jumboHeight) >= offset){
+          }
+          if ((navPos.top+jumboHeight) >= offset){
             $('#members-region').css({'margin-top':'0px'});
             $('#panel-region').removeClass('fixed');
           }

src/scripts/apps/members/members_app.js

@@ -1,4 +1,6 @@
 define(["app"], function(GeneralAssemblyApp) {
+  "use strict";
+
   GeneralAssemblyApp.module("MembersApp", function(MembersApp, GeneralAssemblyApp, Backbone, Marionette, $, _) {
     MembersApp.Router = Marionette.AppRouter.extend({
       appRoutes: {

src/scripts/apps/members/show/show_controller.js

@@ -1,5 +1,7 @@
 define(["app","apps/members/show/show_view"], function(GeneralAssemblyApp, View) {
-  GeneralAssemblyApp.module("MembersApp.Show", function(Show, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("MembersApp.Show", function(Show, GeneralAssemblyApp, Backbone, Marionette, $) {
     Show.Controller = {
       showMember: function(id) {
         require(["entities/member","entities/top_contributors"], function() {

src/scripts/apps/members/show/show_view.js

@@ -1,5 +1,7 @@
 define(["app"], function(GeneralAssemblyApp){
-  GeneralAssemblyApp.module("MembersApp.Show.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("MembersApp.Show.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $) {
     View.Layout = Marionette.Layout.extend({
       template: "#member-show-layout",
       regions: {

src/scripts/apps/watched_bills/list/list_controller.js

@@ -1,4 +1,6 @@
 define(["app","apps/watched_bills/list/list_view"], function(GeneralAssemblyApp, View) {
+  "use strict";
+
   GeneralAssemblyApp.module("WatchedBillsApp.List", function(List, GeneralAssemblyApp, Backbone, Marionette, $, _) {
     List.Controller = {
       listCategories: function() {
@@ -8,20 +10,19 @@ define(["app","apps/watched_bills/list/list_view"], function(GeneralAssemblyApp,
           var categories_layout = new View.CategoriesLayout();
 
           $.when(fetchingWatchedBills, fetchingBillsCount).done(function(watched_bills, bills_count) {
-            category_model_data = _.chain(watched_bills.models)
-              .countBy(function(model) { return model.get("category") })
+            var category_model_data = _.chain(watched_bills.models)
+              .countBy(function(model) { return model.get("category"); })
               .pairs()
               .map(function(model) { return {name: model[0], count: model[1]}; })
               .value();
-            window.category_model_data = category_model_data
 
-            categories = new GeneralAssemblyApp.Entities.BillCategories( category_model_data );
+            var categories = new GeneralAssemblyApp.Entities.BillCategories( category_model_data );
 
-            categories_view = new View.CategoriesView({
+            var categories_view = new View.CategoriesView({
               collection: categories
             });
 
-            bills_count_view = new GeneralAssemblyApp.Common.View.BillsCountView({
+            var bills_count_view = new GeneralAssemblyApp.Common.View.BillsCountView({
               model: bills_count,
               className: "jumbotron"
             });
@@ -35,9 +36,9 @@ define(["app","apps/watched_bills/list/list_view"], function(GeneralAssemblyApp,
           });
         });
       },
-      listWatchedBills: function(category) {
+      listWatchedBills: function() {
       }
-    }
+    };
   });
   return GeneralAssemblyApp.WatchedBillsApp.List.Controller;
 });

src/scripts/apps/watched_bills/list/list_view.js

@@ -1,5 +1,7 @@
 define(["app"], function(GeneralAssemblyApp) {
-  GeneralAssemblyApp.module("WatchedBillsApp.List.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("WatchedBillsApp.List.View", function(View, GeneralAssemblyApp, Backbone, Marionette, $) {
     View.CategoriesLayout = Marionette.Layout.extend({
       template: "#bill-category-layout",
       regions: {
@@ -27,7 +29,7 @@ define(["app"], function(GeneralAssemblyApp) {
       showBillsCategory: function(e) {
         e.preventDefault();
         e.stopPropagation();
-        GeneralAssemblyApp.trigger("watchedbills:categories:show", this.model.get("name"))
+        GeneralAssemblyApp.trigger("watchedbills:categories:show", this.model.get("name"));
       }
     });
 

src/scripts/apps/watched_bills/show/show_controller.js

@@ -1,24 +1,26 @@
 define(["app","apps/watched_bills/show/show_view"], function(GeneralAssemblyApp, View) {
-  GeneralAssemblyApp.module("WatchedBillsApp.Show", function(Show, GeneralAssemblyApp, Backbone, Marionette, $, _) {
+  "use strict";
+
+  GeneralAssemblyApp.module("WatchedBillsApp.Show", function(Show, GeneralAssemblyApp, Backbone, Marionette, $) {
     Show.Controller = {
       showBillsForCategory: function(category) {
         require(["entities/watched_bill"], function() {
           var fetchingWatchedBills = GeneralAssemblyApp.request("watched_bills:collection");
           var categoryLayout = new View.CategoryLayout();
 
           $.when(fetchingWatchedBills).done(function(watched_bills) {
-            billsForCategory = GeneralAssemblyApp.Entities.FilteredCollection({
+            var billsForCategory = GeneralAssemblyApp.Entities.FilteredCollection({
               collection: watched_bills
             });
 
             billsForCategory.filter({category: category});
 
-            categoryView = new View.CategoryCollectionView({
+            var categoryView = new View.CategoryCollectionView({
               collection: billsForCategory
             });
 
-            headline = new GeneralAssemblyApp.Entities.CetegoryHeadline({category: category.replace(/\_/g, " ")});
-            headlineView = new View.CategoryHeadlineView({
+            var headline = new GeneralAssemblyApp.Entities.CetegoryHeadline({category: category.replace(/\_/g, " ")});
+            var headlineView = new View.CategoryHeadlineView({
               model: headline
             });
 
@@ -37,5 +39,5 @@ define(["app","apps/watched_bills/show/show_view"], function(GeneralAssemblyApp,
       }
     };
   });
-return GeneralAssemblyApp.WatchedBillsApp.Show.Controller;
+  return GeneralAssemblyApp.WatchedBillsApp.Show.Controller;
 });