From a826bd16f795d3c373995b8c62266df04079b33a Mon Sep 17 00:00:00 2001 From: kevgliss Date: Tue, 21 Jul 2015 13:36:03 -0700 Subject: [PATCH] Pleasing the JSHint gods --- .jshintignore | 6 ++---- lemur/static/app/angular/app.js | 8 ++++---- lemur/static/app/angular/authentication/services.js | 4 ++-- .../app/angular/authorities/authority/authority.js | 4 ++-- .../angular/certificates/certificate/certificate.js | 2 +- lemur/static/app/angular/certificates/services.js | 13 ++++++------- lemur/static/app/angular/components/filters.js | 2 ++ lemur/static/app/angular/dashboard/dashboard.js | 9 ++++----- lemur/static/app/angular/domains/services.js | 2 ++ lemur/static/app/angular/elbs/services.js | 4 +++- lemur/static/app/angular/listeners/services.js | 2 ++ lemur/static/app/angular/plugins/services.js | 2 ++ lemur/static/app/angular/roles/services.js | 4 +++- package.json | 3 ++- 14 files changed, 37 insertions(+), 28 deletions(-) diff --git a/.jshintignore b/.jshintignore index 82755159..55644736 100644 --- a/.jshintignore +++ b/.jshintignore @@ -1,4 +1,2 @@ -tests/ -lemur/static/lemur/scripts/lib/ -lemur/static/lemur/dist/ -lemur/static/lemur/vendor/ \ No newline at end of file +lemur/static//dist/ +lemur/static/app/vendor/ \ No newline at end of file diff --git a/lemur/static/app/angular/app.js b/lemur/static/app/angular/app.js index 3ed03188..2f0cc90a 100644 --- a/lemur/static/app/angular/app.js +++ b/lemur/static/app/angular/app.js @@ -65,11 +65,11 @@ lemur.factory('LemurRestangular', function (Restangular, $location, $auth) { RestangularConfigurer.setBaseUrl('http://localhost:5000/api/1'); RestangularConfigurer.setDefaultHttpFields({withCredentials: true}); - RestangularConfigurer.addResponseInterceptor(function (data, operation, what, url, response, deferred) { + RestangularConfigurer.addResponseInterceptor(function (data, operation) { var extractedData; // .. to look for getList operations - if (operation === "getList") { + if (operation === 'getList') { // .. and handle the data and meta data extractedData = data.items; extractedData.total = data.total; @@ -79,7 +79,7 @@ lemur.factory('LemurRestangular', function (Restangular, $location, $auth) { return extractedData; }); - RestangularConfigurer.addFullRequestInterceptor(function (element, operation, route, url, headers, params, httpConfig) { + RestangularConfigurer.addFullRequestInterceptor(function (element, operation, route, url, headers, params) { // We want to make sure the user is auth'd before any requests if (!$auth.isAuthenticated()) { $location.path('/login'); @@ -97,7 +97,7 @@ lemur.factory('LemurRestangular', function (Restangular, $location, $auth) { newParams.sortDir = params[item]; } else if (item.indexOf(f) > -1) { var key = regExp.exec(item)[1]; - newParams['filter'] = key + ";" + params[item]; + newParams.filter = key + ';' + params[item]; } else { newParams[item] = params[item]; } diff --git a/lemur/static/app/angular/authentication/services.js b/lemur/static/app/angular/authentication/services.js index 193989e0..dddffeb4 100644 --- a/lemur/static/app/angular/authentication/services.js +++ b/lemur/static/app/angular/authentication/services.js @@ -28,7 +28,7 @@ angular.module('lemur') AuthenticationService.authenticate = function (provider) { $auth.authenticate(provider) .then( - function (user) { + function () { UserService.getCurrentUser(); $rootScope.$emit('user:login'); $location.url('/certificates'); @@ -56,7 +56,7 @@ angular.module('lemur') body: 'You have been successfully logged out.' }); $location.path('/'); - }) + }); }; }); diff --git a/lemur/static/app/angular/authorities/authority/authority.js b/lemur/static/app/angular/authorities/authority/authority.js index e5f4ffc2..419e49fd 100644 --- a/lemur/static/app/angular/authorities/authority/authority.js +++ b/lemur/static/app/angular/authorities/authority/authority.js @@ -19,10 +19,10 @@ angular.module('lemur') $scope.loading = false; $scope.create = function (authority) { WizardHandler.wizard().context.loading = true; - AuthorityService.create(authority).then(function (resposne) { + AuthorityService.create(authority).then(function () { WizardHandler.wizard().context.loading = false; $modalInstance.close(); - }) + }); }; PluginService.get('issuer').then(function (plugins) { diff --git a/lemur/static/app/angular/certificates/certificate/certificate.js b/lemur/static/app/angular/certificates/certificate/certificate.js index c2c47f0f..9a166050 100644 --- a/lemur/static/app/angular/certificates/certificate/certificate.js +++ b/lemur/static/app/angular/certificates/certificate/certificate.js @@ -16,7 +16,7 @@ angular.module('lemur') $scope.create = function (certificate) { WizardHandler.wizard().context.loading = true; - CertificateService.create(certificate).then(function (response) { + CertificateService.create(certificate).then(function () { WizardHandler.wizard().context.loading = false; $modalInstance.close(); }); diff --git a/lemur/static/app/angular/certificates/services.js b/lemur/static/app/angular/certificates/services.js index bb7eba53..504c2bcd 100644 --- a/lemur/static/app/angular/certificates/services.js +++ b/lemur/static/app/angular/certificates/services.js @@ -1,6 +1,5 @@ -/** - * Created by kglisson on 1/19/15. - */ +'use strict'; + angular.module('lemur') .service('CertificateApi', function (LemurRestangular, DomainService) { LemurRestangular.extendModel('certificates', function (obj) { @@ -102,7 +101,7 @@ angular.module('lemur') CertificateService.create = function (certificate) { certificate.attachSubAltName(); return CertificateApi.post(certificate).then( - function (response) { + function () { toaster.pop({ type: 'success', title: certificate.name, @@ -132,8 +131,8 @@ angular.module('lemur') }; CertificateService.upload = function (certificate) { - CertificateApi.customPOST(certificate, "upload").then( - function (response) { + CertificateApi.customPOST(certificate, 'upload').then( + function () { toaster.pop({ type: 'success', title: certificate.name, @@ -163,7 +162,7 @@ angular.module('lemur') certificate.privateKey = response.key; } }, - function (response) { + function () { toaster.pop({ type: 'error', title: certificate.name, diff --git a/lemur/static/app/angular/components/filters.js b/lemur/static/app/angular/components/filters.js index 6229e25d..4e316fe7 100644 --- a/lemur/static/app/angular/components/filters.js +++ b/lemur/static/app/angular/components/filters.js @@ -1,3 +1,5 @@ +'use strict'; + angular.module('lemur'). filter('titleCase', function () { return function (str) { diff --git a/lemur/static/app/angular/dashboard/dashboard.js b/lemur/static/app/angular/dashboard/dashboard.js index 8e88d66b..f0d94eab 100644 --- a/lemur/static/app/angular/dashboard/dashboard.js +++ b/lemur/static/app/angular/dashboard/dashboard.js @@ -7,9 +7,8 @@ angular.module('lemur') controller: 'DashboardController' }); }) - .controller('DashboardController', function ($scope, $rootScope, $filter, $location, LemurRestangular, ngTableParams) { + .controller('DashboardController', function ($scope, $rootScope, $filter, $location, LemurRestangular) { - var baseStats = LemurRestangular.all('stats'); var baseAccounts = LemurRestangular.all('accounts'); baseAccounts.getList() @@ -78,16 +77,16 @@ angular.module('lemur') LemurRestangular.all('certificates').customGET('stats', {metric: 'issuer'}) .then(function (data) { - $scope.issuers = data['items']; + $scope.issuers = data.items; }); LemurRestangular.all('certificates').customGET('stats', {metric: 'bits'}) .then(function (data) { - $scope.bits = data['items']; + $scope.bits = data.items; }); LemurRestangular.all('certificates').customGET('stats', {metric: 'not_after'}) .then(function (data) { - $scope.expiring = {labels: data['items']['labels'], values: [data['items']['values']]}; + $scope.expiring = {labels: data.items.labels, values: [data.items.values]}; }); }); diff --git a/lemur/static/app/angular/domains/services.js b/lemur/static/app/angular/domains/services.js index 3ac5579b..39c54b99 100644 --- a/lemur/static/app/angular/domains/services.js +++ b/lemur/static/app/angular/domains/services.js @@ -1,3 +1,5 @@ +'use strict'; + angular.module('lemur') .service('DomainApi', function (LemurRestangular) { return LemurRestangular.all('domains'); diff --git a/lemur/static/app/angular/elbs/services.js b/lemur/static/app/angular/elbs/services.js index 3ea3eadc..83d98dc5 100644 --- a/lemur/static/app/angular/elbs/services.js +++ b/lemur/static/app/angular/elbs/services.js @@ -1,5 +1,7 @@ +'use strict'; + angular.module('lemur') - .service('ELBApi', function (LemurRestangular, ListenerService) { + .service('ELBApi', function (LemurRestangular) { LemurRestangular.extendModel('elbs', function (obj) { return angular.extend(obj, { attachListener: function (listener) { diff --git a/lemur/static/app/angular/listeners/services.js b/lemur/static/app/angular/listeners/services.js index bd57c35f..ef141c17 100644 --- a/lemur/static/app/angular/listeners/services.js +++ b/lemur/static/app/angular/listeners/services.js @@ -1,3 +1,5 @@ +'use strict'; + angular.module('lemur') .service('ListenerApi', function (LemurRestangular) { return LemurRestangular.all('listeners'); diff --git a/lemur/static/app/angular/plugins/services.js b/lemur/static/app/angular/plugins/services.js index 2672e281..ed54bff6 100644 --- a/lemur/static/app/angular/plugins/services.js +++ b/lemur/static/app/angular/plugins/services.js @@ -1,3 +1,5 @@ +'use strict'; + angular.module('lemur') .service('PluginApi', function (LemurRestangular) { return LemurRestangular.all('plugins'); diff --git a/lemur/static/app/angular/roles/services.js b/lemur/static/app/angular/roles/services.js index 84e972c5..5b6d336b 100644 --- a/lemur/static/app/angular/roles/services.js +++ b/lemur/static/app/angular/roles/services.js @@ -1,3 +1,5 @@ +'use strict'; + angular.module('lemur') .service('RoleApi', function (LemurRestangular) { LemurRestangular.extendModel('roles', function (obj) { @@ -108,7 +110,7 @@ angular.module('lemur') role.username = response.username; } }, - function (response) { + function () { toaster.pop({ type: 'error', title: role.name, diff --git a/package.json b/package.json index 314cfb3d..f025204b 100644 --- a/package.json +++ b/package.json @@ -62,10 +62,11 @@ "pretest": "npm install && npm run build_static", "build_static": "gulp build", "prelint": "npm install", - "lint": "jshint app/", + "lint": "jshint lemur/static/app/", "test": "gulp test" }, "devDependencies": { + "jshint": "^2.8.0", "karma-chrome-launcher": "^0.2.0" } }