From 77d5772a2e3b67e5c8dcb3833cab38b5937f1f0f Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 14 Sep 2016 18:51:50 -0700 Subject: [PATCH] cleaning up jshint errors --- awx/ui/client/src/app.js | 95 +------------------ .../host-summary/host-summary.route.js | 5 - .../list/job-templates-list.controller.js | 2 +- .../organizations-job-templates.controller.js | 2 +- awx/ui/client/src/shared/icon/main.js | 2 +- awx/ui/client/src/shared/main.js | 2 - .../src/shared/socket/socket.service.js | 3 +- 7 files changed, 5 insertions(+), 106 deletions(-) diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index cff60eb1ec..fbade9490f 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -195,7 +195,7 @@ var tower = angular.module('Tower', [ 'StandardOutHelper', 'LogViewerOptionsDefinition', 'JobDetailHelper', - 'socket', + socket.name, 'lrInfiniteScroll', 'LoadConfigHelper', 'PortalJobsListDefinition', @@ -240,99 +240,6 @@ var tower = angular.module('Tower', [ }); $stateProvider. - // state('dashboard', { - // url: '/home', - // templateUrl: urlPrefix + 'partials/home.html', - // controller: Home, - // params: { licenseMissing: null }, - // data: { - // activityStream: true, - // refreshButton: true - // }, - // ncyBreadcrumb: { - // label: "DASHBOARD" - // }, - // resolve: { - // graphData: ['$q', 'jobStatusGraphData', '$rootScope', - // function($q, jobStatusGraphData, $rootScope) { - // return $rootScope.featuresConfigured.promise.then(function() { - // return $q.all({ - // jobStatus: jobStatusGraphData.get("month", "all"), - // }); - // }); - // } - // ] - // } - // }). - // - // state('jobs', { - // url: '/jobs', - // templateUrl: urlPrefix + 'partials/jobs.html', - // controller: JobsListController, - // ncyBreadcrumb: { - // label: "JOBS" - // } - // }). - // - // state('projects', { - // url: '/projects?{status}', - // templateUrl: urlPrefix + 'partials/projects.html', - // controller: ProjectsList, - // data: { - // activityStream: true, - // activityStreamTarget: 'project' - // }, - // ncyBreadcrumb: { - // label: "PROJECTS" - // }, - // // socket: '{"groups":{"jobs": ["status_changed"]}}' - // // resolve: { - // // socket: ['SocketService', '$rootScope', - // // function(SocketService, $rootScope) { - // // var self = this; - // // $rootScope.socketPromise.promise.then(function(){ - // // SocketService.subscribe(self); - // // return true; - // // }); - // // }] - // // }, - // }). - // - // state('projects.add', { - // url: '/add', - // templateUrl: urlPrefix + 'partials/projects.html', - // controller: ProjectsAdd, - // ncyBreadcrumb: { - // parent: "projects", - // label: "CREATE PROJECT" - // } - // }). - // - // state('projects.edit', { - // url: '/:id', - // templateUrl: urlPrefix + 'partials/projects.html', - // controller: ProjectsEdit, - // data: { - // activityStreamId: 'id' - // }, - // ncyBreadcrumb: { - // parent: 'projects', - // label: '{{name}}' - // } - // }). - // - // state('projectOrganizations', { - // url: '/projects/:project_id/organizations', - // templateUrl: urlPrefix + 'partials/projects.html', - // controller: OrganizationsList - // }). - // - // state('projectOrganizationAdd', { - // url: '/projects/:project_id/organizations/add', - // templateUrl: urlPrefix + 'partials/projects.html', - // controller: OrganizationsAdd - // }). - state('teams', { url: '/teams', templateUrl: urlPrefix + 'partials/teams.html', diff --git a/awx/ui/client/src/job-detail/host-summary/host-summary.route.js b/awx/ui/client/src/job-detail/host-summary/host-summary.route.js index 616e393dd3..8f5c1d2c0c 100644 --- a/awx/ui/client/src/job-detail/host-summary/host-summary.route.js +++ b/awx/ui/client/src/job-detail/host-summary/host-summary.route.js @@ -9,11 +9,6 @@ import {templateUrl} from '../../shared/template-url/template-url.factory'; export default { name: 'jobDetail.host-summary', url: '/event-summary', - socket: { - "groups":{ - "jobs": ["status_changed"] - } - }, socket: { "groups":{ "jobs": ["status_changed", "summary"], diff --git a/awx/ui/client/src/job-templates/list/job-templates-list.controller.js b/awx/ui/client/src/job-templates/list/job-templates-list.controller.js index 86890c7a5f..ed5372e908 100644 --- a/awx/ui/client/src/job-templates/list/job-templates-list.controller.js +++ b/awx/ui/client/src/job-templates/list/job-templates-list.controller.js @@ -41,7 +41,7 @@ export default if ($rootScope.JobStatusChange) { $rootScope.JobStatusChange(); } - $rootScope.JobStatusChange = $rootScope.$on(`ws-jobs`, function (e, data) { + $rootScope.JobStatusChange = $rootScope.$on(`ws-jobs`, function () { $scope.search(list.iterator); }); diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js index 53e4317336..ae1000a5c8 100644 --- a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js +++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js @@ -24,7 +24,7 @@ export default ['$scope', '$rootScope', '$location', '$log', if ($rootScope.JobStatusChange) { $rootScope.JobStatusChange(); } - $rootScope.JobStatusChange = $rootScope.$on(`ws-jobs`, function (e, data) { + $rootScope.JobStatusChange = $rootScope.$on(`ws-jobs`, function () { $scope.search(list.iterator); }); diff --git a/awx/ui/client/src/shared/icon/main.js b/awx/ui/client/src/shared/icon/main.js index a2dcf5a30c..87c8a0d474 100644 --- a/awx/ui/client/src/shared/icon/main.js +++ b/awx/ui/client/src/shared/icon/main.js @@ -3,5 +3,5 @@ import icon from './icon.directive'; export default angular.module('awIcon', []) - .directive('awIcon', icon) + .directive('awIcon', icon); //.directive('includeSvg', includeSvg); diff --git a/awx/ui/client/src/shared/main.js b/awx/ui/client/src/shared/main.js index 60c812e12c..fca72b91e1 100644 --- a/awx/ui/client/src/shared/main.js +++ b/awx/ui/client/src/shared/main.js @@ -6,7 +6,6 @@ import listGenerator from './list-generator/main'; import pagination from './pagination/main'; -import title from './title.directive'; import lodashAsPromised from './lodash-as-promised'; import stringFilters from './string-filters/main'; import truncatedText from './truncated-text.directive'; @@ -22,5 +21,4 @@ angular.module('shared', [listGenerator.name, ]) .factory('lodashAsPromised', lodashAsPromised) .directive('truncatedText', truncatedText) - //.directive('title', title) .provider('$stateExtender', stateExtender); diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js index 49aa2dc1f9..f9bfb1ea0d 100644 --- a/awx/ui/client/src/shared/socket/socket.service.js +++ b/awx/ui/client/src/shared/socket/socket.service.js @@ -30,7 +30,7 @@ export default $log.debug('Websocket Error Logged: ' + error); //log errors }; - self.socket.onclose = function (error, obj) { + self.socket.onclose = function (error) { $log.debug('Websocket Disconnected: '+error); self.checkStatus(); }; @@ -83,7 +83,6 @@ export default } }, subscribe: function(state){ - console.log("Next state: " + state.name); this.emit(JSON.stringify(state.socket)); this.setLast(state); },