Merge pull request #436 from davidmsibley/eslint-angular-module

ESLint angular/module rules

package.json

@@ -135,8 +135,6 @@
       ],
       "angular/controller-as": "off",
 
-      "angular/module-setter": "warn",
-      "angular/module-getter": "warn",
       "max-len": "warn",
       "promise/catch-or-return": "warn",
       "promise/always-return": "warn",

uw-frame-components/js/app-config.js

@@ -1,8 +1,6 @@
 define(['angular'], function(angular) {
   /* Keep in sync with docs/markdown/configuration.md*/
-
-    var config = angular.module('app-config', []);
-    config
+  return angular.module('app-config', [])
         .value('APP_FLAGS', {
             'showSearch': true,
             'isWeb': false,
@@ -70,6 +68,4 @@ define(['angular'], function(angular) {
             'description': 'This is just an example of a toggle. Look at your localStorage after you switch this on for the first time.',
           },
         ]);
-
-    return config;
 });

uw-frame-components/js/frame-config.js

@@ -1,6 +1,5 @@
 define(['angular'], function(angular) {
-    var config = angular.module('frame-config', []);
-    config
+    return angular.module('frame-config', [])
         .constant('THEMES',
         {'themeVersion': 7,
         /* THOU SHALT INCREMENT THIS VERSION NUMBER IF THOU CHANGEST ANY OF THE THEMES BELOW  */
@@ -1028,6 +1027,4 @@ define(['angular'], function(angular) {
             'description': 'This flag disables announcement group filtering if you have it enabled (page refresh required)',
           },
         ]);
-
-    return config;
 });

uw-frame-components/js/override.js

@@ -1,12 +1,7 @@
 define(['angular'], function(angular) {
   /* Keep in sync with docs/markdown/configuration.md*/
-
-  var config = angular.module('override', []);
-  config
-    // see configuration.md for howto
+  return angular.module('override', [])
     .constant('OVERRIDE', {
 
     });
-
-  return config;
 });

uw-frame-components/main.js

@@ -1,9 +1,9 @@
 'use strict';
 require(['./config'], function(config) {
+    // eslint-disable-next-line angular/module-getter
     require.config(config);
 
     require(['angular', 'my-app'], function(angular) {
         angular.bootstrap(document, ['my-app']);
     });
 });
-

uw-frame-components/my-app/main.js

@@ -8,17 +8,8 @@ define(['angular',
     'portal/about/route',
     'portal/widgets/routes',
   ], function(angular, $, portal, main, settings, notifications, features, about, widgets) {
-    /*
-     This module intentionally left empty. This file is intended to serve as an extension point
-     for My UW Madison 'App' developers that overlay angularjs-portal-frame.
-
-     For more information, see: https://github.com/UW-Madison-DoIT/my-app-seed
-     */
-    var app = angular.module('my-app', ['portal']);
-
-    // Example route configuration
-    // TODO: Think of a more extensible approach such that frame and app can each manage their own routing without conflict
-    app.config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
+    return angular.module('my-app', ['portal'])
+    .config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
         $locationProvider.html5Mode(true);
         $routeProvider.
             when('/settings', settings.betaSettings).
@@ -33,6 +24,4 @@ define(['angular',
             when('/', main.main).
             otherwise('/');
     }]);
-
-    return app;
 });

uw-frame-components/portal/about/services.js

@@ -1,9 +1,8 @@
 'use strict';
 
 define(['angular'], function(angular) {
-  var app = angular.module('portal.about.services', []);
-
-  app.factory('portalAboutService', ['$http', 'miscService', 'FRAME_URLS', function($http, miscService, FRAME_URLS) {
+  return angular.module('portal.about.services', [])
+  .factory('portalAboutService', ['$http', 'miscService', 'FRAME_URLS', function($http, miscService, FRAME_URLS) {
     /**
     * Gets frame information from generated about-frame.json
     **/
@@ -29,7 +28,4 @@ define(['angular'], function(angular) {
       getDetails: getDetails,
     };
   }]);
-
-  return app;
 });
-

uw-frame-components/portal/features/controllers.js

@@ -1,10 +1,9 @@
 'use strict';
 
 define(['angular', 'require'], function(angular, require) {
-  var app = angular.module('portal.features.controllers', []);
+  angular.module('portal.features.controllers', [])
 
-
-  app.controller('PortalFeaturesController', ['miscService', '$localStorage', '$sessionStorage', '$scope', '$document', 'FEATURES',
+  .controller('PortalFeaturesController', ['miscService', '$localStorage', '$sessionStorage', '$scope', '$document', 'FEATURES',
     '$mdDialog', 'portalFeaturesService', '$sanitize', 'MISC_URLS',
     function(miscService, $localStorage, $sessionStorage, $scope, $document, FEATURES, $mdDialog, portalFeaturesService, $sanitize, MISC_URLS) {
       $scope.features = [];
@@ -17,9 +16,9 @@ define(['angular', 'require'], function(angular, require) {
           }
         });
       }
-  }]);
+  }])
 
-  app.controller('PortalPopupController', ['$localStorage', '$sessionStorage', '$rootScope', '$scope', '$document', 'FEATURES',
+  .controller('PortalPopupController', ['$localStorage', '$sessionStorage', '$rootScope', '$scope', '$document', 'FEATURES',
     'filterFilter', '$filter', '$mdDialog', 'portalFeaturesService', 'miscService', '$sanitize',
     function($localStorage, $sessionStorage, $rootScope, $scope, $document, FEATURES, filterFilter, $filter, $mdDialog, portalFeaturesService, miscService, $sanitize) {
       // scope functions ---------------------------------------------------------
@@ -147,6 +146,4 @@ define(['angular', 'require'], function(angular, require) {
     // run function -------------------------------------------------------------
     init();
   }]);
-
-  return app;
 });

uw-frame-components/portal/features/directives.js

@@ -1,9 +1,8 @@
 'use strict';
 
 define(['angular', 'require'], function(angular, require) {
-  var app = angular.module('portal.features.directives', []);
-
-  app.directive('buckyAnnouncement', function() {
+  return angular.module('portal.features.directives', [])
+  .directive('buckyAnnouncement', function() {
     return {
       restrict: 'E',
       templateUrl: require.toUrl('./partials/announcement.html'),
@@ -14,6 +13,4 @@ define(['angular', 'require'], function(angular, require) {
       },
     };
   });
-
-  return app;
 });

uw-frame-components/portal/features/services.js

@@ -1,9 +1,8 @@
 'use strict';
 
 define(['angular'], function(angular) {
-  var app = angular.module('portal.features.services', []);
-
-  app.factory('portalFeaturesService', ['$http',
+  return angular.module('portal.features.services', [])
+  .factory('portalFeaturesService', ['$http',
                                         '$q',
                                         'miscService',
                                         'keyValueService',
@@ -296,6 +295,4 @@ define(['angular'], function(angular) {
       getUnseenPopups: getUnseenPopups,
     };
   }]);
-
-  return app;
 });

uw-frame-components/portal/main.js

@@ -49,7 +49,7 @@ define([
 			angular.module('angulartics.google.analytics', []);
 		}
 
-    var app = angular.module('portal', [
+    return angular.module('portal', [
         'app-config',
         'override',
         'frame-config',
@@ -90,9 +90,9 @@ define([
         'ui.sortable',
         'angulartics',
         'angulartics.google.analytics',
-    ]);
+    ])
 
-    app.config(['gravatarServiceProvider', '$analyticsProvider', '$mdThemingProvider', 'THEMES', function(gravatarServiceProvider, $analyticsProvider, $mdThemingProvider, THEMES) {
+    .config(['gravatarServiceProvider', '$analyticsProvider', '$mdThemingProvider', 'THEMES', function(gravatarServiceProvider, $analyticsProvider, $mdThemingProvider, THEMES) {
       gravatarServiceProvider.defaults = {
         'default': 'https://yt3.ggpht.com/-xE0EQR3Ngt8/AAAAAAAAAAI/AAAAAAAAAAA/zTofDHA3-s4/s100-c-k-no/photo.jpg',
       };
@@ -156,9 +156,9 @@ define([
         }
         cur = null;
       }
-    }]);
+    }])
 
-    app.run(function($location,
+    .run(function($location,
                      $log,
                      $http,
                      $rootScope,
@@ -401,6 +401,4 @@ define([
       };
       init();
     });
-
-    return app;
 });

uw-frame-components/portal/main/controllers.js

@@ -1,9 +1,9 @@
 'use strict';
 
 define(['angular', 'require'], function(angular, require) {
-  var app = angular.module('portal.main.controllers', []);
+  return angular.module('portal.main.controllers', [])
 
-  app.controller('PortalMainController', ['$localStorage', '$sessionStorage', '$scope', '$rootScope', '$document', '$location', 'NAMES', 'MISC_URLS', 'APP_FLAGS', 'THEMES', 'miscService', function($localStorage, $sessionStorage, $scope, $rootScope, $document, $location, NAMES, MISC_URLS, APP_FLAGS, THEMES, miscService) {
+  .controller('PortalMainController', ['$localStorage', '$sessionStorage', '$scope', '$rootScope', '$document', '$location', 'NAMES', 'MISC_URLS', 'APP_FLAGS', 'THEMES', 'miscService', function($localStorage, $sessionStorage, $scope, $rootScope, $document, $location, NAMES, MISC_URLS, APP_FLAGS, THEMES, miscService) {
     var defaults = {
       layoutMode: 'list', // other option is 'widgets
     };
@@ -72,10 +72,10 @@ define(['angular', 'require'], function(angular, require) {
 
     // run init
     init();
-  }]);
+  }])
 
   /* Username */
-  app.controller('SessionCheckController', ['$scope', 'mainService', 'NAMES', 'FOOTER_URLS', '$rootScope', function($scope, mainService, NAMES, FOOTER_URLS, $rootScope) {
+  .controller('SessionCheckController', ['$scope', 'mainService', 'NAMES', 'FOOTER_URLS', '$rootScope', function($scope, mainService, NAMES, FOOTER_URLS, $rootScope) {
     var vm = this;
     vm.user = [];
     vm.firstLetter = '';
@@ -98,10 +98,10 @@ define(['angular', 'require'], function(angular, require) {
         }
       }
     });
-  }]);
+  }])
 
   /* Header */
-  app.controller('PortalHeaderController', ['$rootScope', '$scope', '$location', 'NAMES', 'APP_FLAGS', 'MISC_URLS', 'notificationsService', function($rootScope, $scope, $location, NAMES, APP_FLAGS, MISC_URLS, notificationsService) {
+  .controller('PortalHeaderController', ['$rootScope', '$scope', '$location', 'NAMES', 'APP_FLAGS', 'MISC_URLS', 'notificationsService', function($rootScope, $scope, $location, NAMES, APP_FLAGS, MISC_URLS, notificationsService) {
     var vm = this;
     vm.navbarCollapsed = true;
     vm.showLogout = true;
@@ -119,12 +119,10 @@ define(['angular', 'require'], function(angular, require) {
       $scope.showSearch = false;
       vm.navbarCollapsed = !vm.navbarCollapsed;
     };
-  }]);
+  }])
 
   /* Footer */
-  app.controller('PortalFooterController', ['$scope', function($scope) {
+  .controller('PortalFooterController', ['$scope', function($scope) {
       $scope.date = new Date();
   }]);
-
-  return app;
 });

uw-frame-components/portal/main/directives.js

@@ -1,50 +1,48 @@
 'use strict';
 
 define(['angular', 'require'], function(angular, require) {
-  var app = angular.module('portal.main.directives', []);
+  return angular.module('portal.main.directives', [])
 
-  app.directive('uwBody', function() {
+  .directive('uwBody', function() {
     return {
       restrict: 'E',
       templateUrl: require.toUrl('./partials/body.html'),
       controller: 'PortalMainController',
     };
-  });
+  })
 
-  app.directive('portalHeader', function() {
+  .directive('portalHeader', function() {
     return {
       restrict: 'E',
       templateUrl: require.toUrl('./partials/header.html'),
     };
-  });
+  })
 
-  app.directive('sideBarMenu', function() {
+  .directive('sideBarMenu', function() {
     return {
       restrict: 'E',
       templateUrl: require.toUrl('./partials/sidebar-left.html'),
     };
-  });
+  })
 
-  app.directive('username', function() {
+  .directive('username', function() {
     return {
       restrict: 'E',
       templateUrl: require.toUrl('./partials/username.html'),
     };
-  });
+  })
 
-  app.directive('siteFooter', function() {
+  .directive('siteFooter', function() {
       return {
         restrict: 'E',
         templateUrl: require.toUrl('./partials/footer.html'),
       };
-    });
+    })
 
-  app.directive('featuresModalTemplate', function() {
+  .directive('featuresModalTemplate', function() {
       return {
           restrict: 'E',
           templateUrl: require.toUrl('./partials/features-dialog-template.html'),
       };
   });
-
-  return app;
 });

uw-frame-components/portal/main/services.js

@@ -1,9 +1,9 @@
 'use strict';
 
 define(['angular'], function(angular) {
-  var app = angular.module('portal.main.services', []);
+  return angular.module('portal.main.services', [])
 
-  app.factory('mainService', ['$http', '$log', '$sessionStorage', 'miscService', 'SERVICE_LOC', 'APP_FLAGS', function($http, $log, $sessionStorage, miscService, SERVICE_LOC, APP_FLAGS) {
+  .factory('mainService', ['$http', '$log', '$sessionStorage', 'miscService', 'SERVICE_LOC', 'APP_FLAGS', function($http, $log, $sessionStorage, miscService, SERVICE_LOC, APP_FLAGS) {
     var prom = $http.get(SERVICE_LOC.sessionInfo, {cache: true});
     var userPromise;
 
@@ -38,6 +38,4 @@ define(['angular'], function(angular) {
       getUser: getUser,
     };
   }]);
-
-  return app;
 });

uw-frame-components/portal/misc/controllers.js

@@ -1,10 +1,10 @@
 'use strict';
 
 define(['angular'], function(angular) {
-  var app = angular.module('portal.misc.controllers', []);
+  return angular.module('portal.misc.controllers', [])
 
   /* AddToHomeController */
-  app.controller('AddToHomeController', ['$scope', '$timeout', 'PortalAddToHomeService',
+  .controller('AddToHomeController', ['$scope', '$timeout', 'PortalAddToHomeService',
                  function($scope, $timeout, PortalAddToHomeService) {
     $scope.addToHome = function() {
       if(!$scope.inHome && PortalAddToHomeService.canAddToHome($scope.fname)) {
@@ -55,6 +55,4 @@ define(['angular'], function(angular) {
 
     init();
   }]);
-
-  return app;
  });