diff --git a/neutrino-custom/lint.js b/neutrino-custom/lint.js index 0d041df9d..823d76ef9 100644 --- a/neutrino-custom/lint.js +++ b/neutrino-custom/lint.js @@ -38,12 +38,17 @@ module.exports = neutrino => { 'block-spacing': ['error', 'always'], 'comma-spacing': 'error', 'comma-style': 'error', + 'curly': ['error', 'multi-line', 'consistent'], 'eol-last': 'error', 'eqeqeq': 'error', 'guard-for-in': 'error', 'indent': ['error', 4, { 'SwitchCase': 1 }], + 'key-spacing': ['error', { + beforeColon: false, + afterColon: true + }], 'keyword-spacing': 'error', 'linebreak-style': 'error', 'new-cap': 'error', @@ -89,6 +94,7 @@ module.exports = neutrino => { 'no-useless-call': 'error', 'no-void': 'error', 'no-with': 'error', + 'object-curly-spacing': ['error', 'always'], 'semi': 'error', 'space-before-blocks': 'error', 'space-before-function-paren': ['error', { @@ -97,6 +103,11 @@ module.exports = neutrino => { asyncArrow: 'always' }], 'strict': ['error', 'global'], + 'quote-props': ['error', 'as-needed', { + keywords: false, + unnecessary: true, + numbers: false + }], 'yoda': 'error' }, globals: ['angular', '$', '_', 'treeherder', 'perf', @@ -108,4 +119,3 @@ module.exports = neutrino => { } })); }; - diff --git a/ui/js/components/auth.js b/ui/js/components/auth.js index 35b08992e..862315627 100644 --- a/ui/js/components/auth.js +++ b/ui/js/components/auth.js @@ -48,7 +48,7 @@ treeherder.component("login", { var ctrl = this; ctrl.user = {}; // "clears out" the user when it is detected to be logged out. - var loggedOutUser = {is_staff: false, username: "", email: "", loggedin: false}; + var loggedOutUser = { is_staff: false, username: "", email: "", loggedin: false }; ctrl.userLoggingIn = $location.path() === '/login'; @@ -123,7 +123,7 @@ treeherder.component("login", { newUser.loggedin = true; localStorageService.set("user", newUser); ctrl.user = newUser; - ctrl.onUserChange({$event: {user: newUser}}); + ctrl.onUserChange({ $event: { user: newUser } }); }; @@ -131,7 +131,7 @@ treeherder.component("login", { localStorageService.set("user", loggedOutUser); localStorageService.set('taskcluster.credentials', {}); ctrl.user = loggedOutUser; - ctrl.onUserChange({$event: {user: loggedOutUser}}); + ctrl.onUserChange({ $event: { user: loggedOutUser } }); }; }] }); @@ -166,7 +166,7 @@ treeherder.component("loginCallback", { const results = $location.search(); if (results.certificate) { results.certificate = JSON.parse(results.certificate); - payload.ext = hawk.utils.base64urlEncode(JSON.stringify({"certificate": results.certificate})); + payload.ext = hawk.utils.base64urlEncode(JSON.stringify({ certificate: results.certificate })); } const header = hawk.client.header(loginUrl, 'GET', payload); @@ -174,7 +174,7 @@ treeherder.component("loginCallback", { // send a request from client side to TH server signed with TC // creds from login.taskcluster.net $http.get(loginUrl, - {headers: {"tcauth": header.field}}) + { headers: { tcauth: header.field } }) .then(function (resp) { var user = resp.data; user.loggedin = true; diff --git a/ui/js/components/perf/compare.js b/ui/js/components/perf/compare.js index 34650354b..9cf402777 100644 --- a/ui/js/components/perf/compare.js +++ b/ui/js/components/perf/compare.js @@ -2,8 +2,9 @@ treeherder.component('phCompareTable', { templateUrl: ['$element', '$attrs', function ($element, $attrs) { - if ($attrs.type === 'trend') + if ($attrs.type === 'trend') { return 'partials/perf/trendtable.html'; + } return 'partials/perf/comparetable.html'; }], bindings: { @@ -51,8 +52,9 @@ treeherder.component('phCompareTable', { return _.filter(results, function (result) { var testCondition = `${key} ${($attrs.type === 'trend') ? result.trendResult.name : result.name}`; return _.every(ctrl.filterOptions.filter.split(' '), function (matchText) { - if ($attrs.type === 'trend') + if ($attrs.type === 'trend') { return filter(testCondition, matchText) && shouldBeShown(result.trendResult); + } return filter(testCondition, matchText) && shouldBeShown(result); }); }); @@ -67,7 +69,7 @@ treeherder.component('phCompareTable', { } }); ctrl.filteredResultList = _.map(_.keys(ctrl.filteredResultList), function (testName) { - return {'testName': testName, 'results': ctrl.filteredResultList[testName]}; + return { testName: testName, results: ctrl.filteredResultList[testName] }; }); }; @@ -110,7 +112,7 @@ treeherder.component('compareError', { }); treeherder.component('distributionGraph', { - template:` + template: `
{{$ctrl.minValue|abbreviatedNumber}} | diff --git a/ui/js/controllers/admin/admin.js b/ui/js/controllers/admin/admin.js index 989b49ade..6b24cb182 100644 --- a/ui/js/controllers/admin/admin.js +++ b/ui/js/controllers/admin/admin.js @@ -98,7 +98,7 @@ admin.controller('AdminCtrl', [ } }; - $scope.master_profile = {name: '', exclusions: []}; + $scope.master_profile = { name: '', exclusions: [] }; // the promises may not yet have returned, but this just tells // us that we don't need to re-run this function. diff --git a/ui/js/controllers/bugfiler.js b/ui/js/controllers/bugfiler.js index f755ca930..b3feb76ef 100644 --- a/ui/js/controllers/bugfiler.js +++ b/ui/js/controllers/bugfiler.js @@ -227,9 +227,9 @@ treeherder.controller('BugFilerCtrl', [ $scope.searching = "DXR & Mercurial"; const dxrlink = `${dxrBaseUrl}mozilla-central/search?q=file:${$uibModalInstance.possibleFilename}&redirect=false&limit=5`; // Bug 1358328 - We need to override headers here until DXR returns JSON with the default Accept header - $http.get(dxrlink, {"headers": { - "Accept": "application/json" - }}).then((secondRequest) => { + $http.get(dxrlink, { headers: { + Accept: "application/json" + } }).then((secondRequest) => { const results = secondRequest.data.results; var resultsCount = results.length; // If the search returns too many results, this probably isn't a good search term, so bail @@ -375,19 +375,19 @@ treeherder.controller('BugFilerCtrl', [ "Content-Type": "application/json; charset=utf-8" }, data: { - "product": productString, - "component": componentString, - "summary": summarystring, - "keywords": keywords, - "version": version.name, - "blocks": blocks, - "depends_on": dependsOn, - "see_also": seeAlso, - "crash_signature": crashSignature, - "severity": severity, - "priority": priority, - "comment": descriptionStrings, - "comment_tags": "treeherder" + product: productString, + component: componentString, + summary: summarystring, + keywords: keywords, + version: version.name, + blocks: blocks, + depends_on: dependsOn, + see_also: seeAlso, + crash_signature: crashSignature, + severity: severity, + priority: priority, + comment: descriptionStrings, + comment_tags: "treeherder" } }); }) diff --git a/ui/js/controllers/filters.js b/ui/js/controllers/filters.js index 871bb6dc1..47d6b7e38 100644 --- a/ui/js/controllers/filters.js +++ b/ui/js/controllers/filters.js @@ -113,7 +113,7 @@ treeherderApp.controller('FilterPanelCtrl', [ }; $scope.createFieldFilter = function () { - $scope.newFieldFilter = {field: "", value: ""}; + $scope.newFieldFilter = { field: "", value: "" }; }; $scope.cancelFieldFilter = function () { $scope.newFieldFilter = null; diff --git a/ui/js/controllers/jobs.js b/ui/js/controllers/jobs.js index 4cd773290..dc2809ed4 100644 --- a/ui/js/controllers/jobs.js +++ b/ui/js/controllers/jobs.js @@ -178,8 +178,7 @@ treeherderApp.controller('ResultSetCtrl', [ $scope.cancelAllJobs = function (revision) { $scope.showConfirmCancelAll = false; - if (!$scope.canCancelJobs()) - return; + if (!$scope.canCancelJobs()) return; ThResultSetModel.cancelAll($scope.resultset.id, $scope.repoName).then(function () { return thBuildApi.cancelAll($scope.repoName, revision); diff --git a/ui/js/controllers/logviewer.js b/ui/js/controllers/logviewer.js index 44063aca5..781e0ddb4 100644 --- a/ui/js/controllers/logviewer.js +++ b/ui/js/controllers/logviewer.js @@ -122,15 +122,15 @@ logViewerApp.controller('LogviewerCtrl', [ } // set the result value and shading color class - $scope.result = {label: 'Result', value: job.result}; + $scope.result = { label: 'Result', value: job.result }; $scope.resultStatusShading = $scope.getShadingClass(job.result); // other properties, in order of appearance $scope.logProperties = [ - {label: 'Job', value: $scope.logViewerTitle}, - {label: 'Machine', value: job.machine_name}, - {label: 'Start', value: dateFilter(job.start_timestamp * 1000, thDateFormat)}, - {label: 'End', value: dateFilter(job.end_timestamp * 1000, thDateFormat)} + { label: 'Job', value: $scope.logViewerTitle }, + { label: 'Machine', value: job.machine_name }, + { label: 'Start', value: dateFilter(job.start_timestamp * 1000, thDateFormat) }, + { label: 'End', value: dateFilter(job.end_timestamp * 1000, thDateFormat) } ]; // Test to disable successful steps checkbox on taskcluster jobs @@ -150,10 +150,10 @@ logViewerApp.controller('LogviewerCtrl', [ ThResultSetModel.getResultSet($scope.repoName, job.result_set_id).then((data) => { const revision = data.data.revision; - $scope.logProperties.push({label: 'Revision', value: revision}); + $scope.logProperties.push({ label: 'Revision', value: revision }); }); - ThJobDetailModel.getJobDetails({job_guid: job.job_guid}).then((jobDetails) => { + ThJobDetailModel.getJobDetails({ job_guid: job.job_guid }).then((jobDetails) => { $scope.job_details = jobDetails; }); }, () => { diff --git a/ui/js/controllers/main.js b/ui/js/controllers/main.js index d430faf72..e566c00d9 100644 --- a/ui/js/controllers/main.js +++ b/ui/js/controllers/main.js @@ -677,7 +677,7 @@ treeherderApp.controller('MainCtrl', [ $scope.changeRepo = function (repo_name) { // preserves filter params as the user changes repos and revisions $location.search(_.extend({ - "repo": repo_name + repo: repo_name }, thJobFilters.getActiveFilters())); }; diff --git a/ui/js/controllers/perf/alerts.js b/ui/js/controllers/perf/alerts.js index 61b362085..751fc05f0 100644 --- a/ui/js/controllers/perf/alerts.js +++ b/ui/js/controllers/perf/alerts.js @@ -165,7 +165,7 @@ perf.controller('AlertsCtrl', [ // can filter by alert statuses or just show everything $scope.statuses = _.map(phAlertSummaryStatusMap); - $scope.statuses = $scope.statuses.concat({id: -1, text: "all"}); + $scope.statuses = $scope.statuses.concat({ id: -1, text: "all" }); $scope.changeAlertSummaryStatus = function (alertSummary, open) { PhAlerts.changeAlertSummaryStatus( @@ -368,7 +368,7 @@ perf.controller('AlertsCtrl', [ // We need to update not only the summary when resetting the alert, // but other summaries affected by the change var summariesToUpdate = [alertSummary].concat(_.flatten(_.map( - _.filter(alertSummary.alerts, {'selected': true}), + _.filter(alertSummary.alerts, { selected: true }), function (alert) { return _.find($scope.alertSummaries, function (alertSummary) { return alertSummary.id === alert.related_summary_id; @@ -406,8 +406,7 @@ perf.controller('AlertsCtrl', [ [alertSummary.push_id, alertSummary.prev_push_id], function (resultSetId) { // skip nulls - if (resultSetId === null) - return; + if (resultSetId === null) return; var repoMap = resultSetToSummaryMap[alertSummary.repository]; // initialize map for this result set, if not already // initialized diff --git a/ui/js/controllers/perf/compare.js b/ui/js/controllers/perf/compare.js index b60761178..4871b2aa8 100644 --- a/ui/js/controllers/perf/compare.js +++ b/ui/js/controllers/perf/compare.js @@ -18,10 +18,11 @@ perf.controller('CompareChooserCtrl', [ $scope.revisionComparison = false; var getParameter = function (paramName, defaultValue) { - if ($stateParams[paramName]) + if ($stateParams[paramName]) { return $stateParams[paramName]; - else if (localStorageService.get(paramName)) + } else if (localStorageService.get(paramName)) { return localStorageService.get(paramName); + } return defaultValue; }; @@ -94,7 +95,7 @@ perf.controller('CompareChooserCtrl', [ $scope.newRevision ).then(function (revision) { return { - revision:revision, + revision: revision, project: $scope.newProject }; }); @@ -281,8 +282,9 @@ perf.controller('CompareResultsCtrl', [ } cmap.name = platform; - if (Object.keys($scope.compareResults).indexOf(testName) < 0) + if (Object.keys($scope.compareResults).indexOf(testName) < 0) { $scope.compareResults[testName] = []; + } $scope.compareResults[testName].push(cmap); }); }); @@ -309,7 +311,7 @@ perf.controller('CompareResultsCtrl', [ PhSeries.getSeriesList( $scope.originalProject.name, - {interval: timeRange, subtests: 0, + { interval: timeRange, subtests: 0, framework: $scope.filterOptions.framework.id }).then( function (originalSeriesList) { @@ -319,7 +321,7 @@ perf.controller('CompareResultsCtrl', [ _.map(originalSeriesList, 'name')); return PhCompare.getResultsMap($scope.originalProject.name, originalSeriesList, - {pushIDs: resultSetIds}); + { pushIDs: resultSetIds }); }).then(function (resultMaps) { var originalResultsMap = resultMaps[$scope.originalResultSet.id]; var newResultsMap = resultMaps[$scope.newResultSet.id]; @@ -345,7 +347,7 @@ perf.controller('CompareResultsCtrl', [ return PhCompare.getResultsMap($scope.newProject.name, newSeriesList, - {pushIDs: [$scope.newResultSet.id]}); + { pushIDs: [$scope.newResultSet.id] }); }).then(function (resultMaps) { $scope.dataLoading = false; displayResults(originalResultsMap, resultMaps[$scope.newResultSet.id]); @@ -366,7 +368,7 @@ perf.controller('CompareResultsCtrl', [ $scope.testList = _.uniq(_.map(originalSeriesList, 'name')); return PhCompare.getResultsMap($scope.originalProject.name, originalSeriesList, - {interval: $scope.selectedTimeRange}); + { interval: $scope.selectedTimeRange }); }).then(function (resultsMap) { var originalResultsMap = resultsMap; PhSeries.getSeriesList( @@ -380,7 +382,7 @@ perf.controller('CompareResultsCtrl', [ _.uniq(_.map(newSeriesList, 'name'))); return PhCompare.getResultsMap($scope.newProject.name, newSeriesList, - {pushIDs: [$scope.newResultSet.id]}); + { pushIDs: [$scope.newResultSet.id] }); }).then(function (resultMaps) { var newResultsMap = resultMaps[$scope.newResultSet.id]; $scope.dataLoading = false; @@ -740,7 +742,7 @@ perf.controller('CompareSubtestResultsCtrl', [ $scope.platformList = _.uniq(_.map(originalSubtestList, 'platform')); return PhCompare.getResultsMap($scope.originalProject.name, originalSubtestList, - {pushIDs: resultSetIds}); + { pushIDs: resultSetIds }); }) ]).then(function (results) { var originalSeriesMap = results[1][$scope.originalResultSet.id]; @@ -778,7 +780,7 @@ perf.controller('CompareSubtestResultsCtrl', [ return PhCompare.getResultsMap($scope.newProject.name, newSeriesList, - {pushIDs: [$scope.newResultSet.id]}); + { pushIDs: [$scope.newResultSet.id] }); }).then(function (newSeriesMaps) { var newSeriesMap = newSeriesMaps[$scope.newResultSet.id]; // There is a chance that we haven't received data for the given signature/resultSet yet @@ -821,7 +823,7 @@ perf.controller('CompareSubtestResultsCtrl', [ $scope.platformList = _.uniq(_.map(originalSubtestList, 'platform')); return PhCompare.getResultsMap($scope.originalProject.name, originalSubtestList, - {interval: $scope.selectedTimeRange}); + { interval: $scope.selectedTimeRange }); }) ]).then( function (originalResults) { @@ -841,7 +843,7 @@ perf.controller('CompareSubtestResultsCtrl', [ return PhCompare.getResultsMap($scope.newProject.name, newSeriesList, - {pushIDs: [$scope.newResultSet.id]}); + { pushIDs: [$scope.newResultSet.id] }); }).then(function (newSeriesMaps) { var newSeriesMap = newSeriesMaps[$scope.newResultSet.id]; // There is a chance that we haven't received data for the given signature/resultSet yet @@ -894,7 +896,7 @@ perf.controller('CompareSubtestDistributionCtrl', ['$scope', '$stateParams', '$q } const numRuns = perfDatumList[subtestSignature].length; let replicatePromises = perfDatumList[subtestSignature].map( - value => PhSeries.getReplicateData({job_id: value.job_id})); + value => PhSeries.getReplicateData({ job_id: value.job_id })); return $q.all(replicatePromises).then((replicateData) => { let replicateValues = replicateData.concat.apply([], replicateData.map((data) => { @@ -905,8 +907,8 @@ perf.controller('CompareSubtestDistributionCtrl', ['$scope', '$stateParams', '$q ); //metrics-graphics doesn't accept "0" as x_accesor replicateValues = replicateValues.map((value, index) => ({ - "replicate": (index + 1).toString(), - "value": value + replicate: (index + 1).toString(), + value: value })); metricsgraphics.data_graphic({ title: `${target} replicates over ${numRuns} run${(numRuns > 1) ? 's' : ''}`, @@ -942,7 +944,7 @@ perf.controller('CompareSubtestDistributionCtrl', ['$scope', '$stateParams', '$q $stateParams.originalProject); $scope.newProject = ThRepositoryModel.getRepo( $stateParams.newProject); - PhSeries.getSeriesList($scope.originalProject.name, {signature: $scope.originalSubtestSignature}).then( + PhSeries.getSeriesList($scope.originalProject.name, { signature: $scope.originalSubtestSignature }).then( (seriesData) => { $scope.testSuite = seriesData[0].suite; $scope.subtest = seriesData[0].test; @@ -955,8 +957,6 @@ perf.controller('CompareSubtestDistributionCtrl', ['$scope', '$stateParams', '$q }).then((result) => { $scope.originalResultSet = result.resultSet; $scope.originalReplicateError = result.replicateDataError; - if ($scope.originalReplicateError) - $scope.noResult = "base"; return fetchAndDrawReplicateGraph($scope.newProject.name, $scope.newRevision, $scope.newSubtestSignature, @@ -964,8 +964,6 @@ perf.controller('CompareSubtestDistributionCtrl', ['$scope', '$stateParams', '$q }).then((result) => { $scope.newResultSet = result.resultSet; $scope.newReplicateError = result.replicateDataError; - if ($scope.newReplicateError) - $scope.noResult = "new"; window.document.title = `${$scope.platform}: ${$scope.testName}`; $scope.dataLoading = false; }); diff --git a/ui/js/controllers/perf/dashboard.js b/ui/js/controllers/perf/dashboard.js index a60551c3d..20caa9061 100644 --- a/ui/js/controllers/perf/dashboard.js +++ b/ui/js/controllers/perf/dashboard.js @@ -61,7 +61,7 @@ perf.controller('dashCtrl', [ getSeriesList = PhSeries.getSeriesList($scope.selectedRepo.name, { interval: $scope.selectedTimeRange.value, subtests: 0, - framework: $scope.framework}).then(function (seriesList) { + framework: $scope.framework }).then(function (seriesList) { return _.filter(seriesList, function (series) { return filterSeriesByTopic(series); }); diff --git a/ui/js/controllers/perf/e10s-trend.js b/ui/js/controllers/perf/e10s-trend.js index 01ed758a7..55cf913e6 100644 --- a/ui/js/controllers/perf/e10s-trend.js +++ b/ui/js/controllers/perf/e10s-trend.js @@ -47,7 +47,7 @@ perf.controller('e10sTrendCtrl', [ if (!$scope.compareResults[baseTestName]) { $scope.compareResults[baseTestName] = []; } - $scope.compareResults[baseTestName].push({baseResult: baseResult, newResult: newResult, trendResult: trendResult}); + $scope.compareResults[baseTestName].push({ baseResult: baseResult, newResult: newResult, trendResult: trendResult }); } } }); @@ -298,7 +298,7 @@ perf.controller('e10sTrendSubtestCtrl', [ if (!$scope.compareResults[baseTestName]) { $scope.compareResults[baseTestName] = []; } - $scope.compareResults[baseTestName].push({baseResult: baseResult, newResult: newResult, trendResult: trendResult}); + $scope.compareResults[baseTestName].push({ baseResult: baseResult, newResult: newResult, trendResult: trendResult }); } } }); diff --git a/ui/js/controllers/perf/graphs.js b/ui/js/controllers/perf/graphs.js index 109d4725f..ad27c55d2 100644 --- a/ui/js/controllers/perf/graphs.js +++ b/ui/js/controllers/perf/graphs.js @@ -287,7 +287,7 @@ perf.controller('GraphsCtrl', [ opts.min = ranges.yaxis.from; opts.max = ranges.yaxis.to; }); - $scope.zoom = {'x': [ranges.xaxis.from, ranges.xaxis.to], 'y': [ranges.yaxis.from, ranges.yaxis.to]}; + $scope.zoom = { x: [ranges.xaxis.from, ranges.xaxis.to], y: [ranges.yaxis.from, ranges.yaxis.to] }; $scope.plot.setupGrid(); $scope.plot.draw(); @@ -442,7 +442,7 @@ perf.controller('GraphsCtrl', [ { xaxis: { mode: 'time' }, series: { shadowSize: 0 }, - selection: { mode: 'xy', color: '#97c6e5'}, + selection: { mode: 'xy', color: '#97c6e5' }, lines: { show: false }, points: { show: true }, legend: { show: false }, @@ -476,8 +476,7 @@ perf.controller('GraphsCtrl', [ $("#graph").on("plothover", function (event, pos, item) { // if examining an item, disable this behaviour - if ($scope.selectedDataPoint) - return; + if ($scope.selectedDataPoint) return; $('#graph').css({ cursor: item ? 'pointer' : '' }); @@ -536,8 +535,9 @@ perf.controller('GraphsCtrl', [ $scope.seriesList[0].platform + " (" + $scope.seriesList[0].projectName + ")"); - if ($scope.seriesList.length > 1) + if ($scope.seriesList.length > 1) { window.document.title += " and others"; + } } else { window.document.title = $state.current.title; } @@ -623,7 +623,7 @@ perf.controller('GraphsCtrl', [ function addSeriesList(partialSeriesList) { $scope.loadingGraphs = true; return $q.all(partialSeriesList.map(function (partialSeries) { - let params = {framework: partialSeries.frameworkId}; + let params = { framework: partialSeries.frameworkId }; if (partialSeries.id) { params.id = partialSeries.id; } @@ -723,11 +723,11 @@ perf.controller('GraphsCtrl', [ ThRepositoryModel.load().then(function () { if ($stateParams.timerange) { var timeRange = _.find(phTimeRanges, - {'value': parseInt($stateParams.timerange)}); + { value: parseInt($stateParams.timerange) }); $scope.myTimerange = timeRange; } else { $scope.myTimerange = _.find(phTimeRanges, - {'value': phDefaultTimeRangeValue}); + { value: phDefaultTimeRangeValue }); } $scope.timeRangeChanged = function () { $scope.loadingGraphs = true; @@ -746,8 +746,8 @@ perf.controller('GraphsCtrl', [ var zoomString = decodeURIComponent($stateParams.zoom).replace(/[\[\{\}\]"]+/g, ''); var zoomArray = zoomString.split(","); var zoomObject = { - "x": zoomArray.slice(0, 2), - "y": zoomArray.slice(2, 4) + x: zoomArray.slice(0, 2), + y: zoomArray.slice(2, 4) }; $scope.zoom = (zoomString) ? zoomObject : []; } else { @@ -778,8 +778,8 @@ perf.controller('GraphsCtrl', [ var partialSeriesString = decodeURIComponent(encodedSeries).replace(/[\[\]"]/g, ''); var partialSeriesArray = partialSeriesString.split(","); var partialSeriesObject = { - project: partialSeriesArray[0], - signature: partialSeriesArray[1].length === 40 ? partialSeriesArray[1] : undefined, + project: partialSeriesArray[0], + signature: partialSeriesArray[1].length === 40 ? partialSeriesArray[1] : undefined, id: partialSeriesArray[1].length === 40 ? undefined : partialSeriesArray[1], visible: partialSeriesArray[2] !== 0, frameworkId: partialSeriesArray[3] @@ -815,7 +815,7 @@ perf.controller('GraphsCtrl', [ } if (option !== undefined) { - var series = _.find($scope.seriesList, {signature: seriesSignature}); + var series = _.find($scope.seriesList, { signature: seriesSignature }); options = { option: option, relatedSeries: series }; } @@ -987,7 +987,7 @@ perf.controller('TestChooserCtrl', ['$scope', '$uibModalInstance', '$http', var branchList = []; thPerformanceBranches.forEach(function (branch) { if (branch !== originalSeries.projectName) { - branchList.push(_.find($scope.projects, {name: branch})); + branchList.push(_.find($scope.projects, { name: branch })); } }); // get each project's series data from remote and use promise to diff --git a/ui/js/controllers/tcjobactions.js b/ui/js/controllers/tcjobactions.js index b66696bec..b49406eac 100644 --- a/ui/js/controllers/tcjobactions.js +++ b/ui/js/controllers/tcjobactions.js @@ -64,7 +64,7 @@ treeherder.controller('TCJobActionsCtrl', [ ThJobDetailModel.getJobDetails({ job_id: decisionTask.id, title: 'artifact uploaded', - value: 'actions.json'}).then(function (details) { + value: 'actions.json' }).then(function (details) { if (!details.length) { alert("Could not find actions.json"); return; diff --git a/ui/js/directives/treeherder/bottom_nav_panel.js b/ui/js/directives/treeherder/bottom_nav_panel.js index b46a9973c..b4068d4e3 100644 --- a/ui/js/directives/treeherder/bottom_nav_panel.js +++ b/ui/js/directives/treeherder/bottom_nav_panel.js @@ -84,12 +84,12 @@ treeherder.directive('thSimilarJobs', [ }); scope.similar_jobs = []; scope.similar_jobs_filters = { - "machine_id": true, - "job_type_id": true, - "build_platform_id": true + machine_id: true, + job_type_id: true, + build_platform_id: true }; scope.update_similar_jobs = function (job) { - var options = {result_set_id__ne: job.result_set_id}; + var options = { result_set_id__ne: job.result_set_id }; angular.forEach(scope.similar_jobs_filters, function (elem, key) { if (elem) { options[key] = job[key]; diff --git a/ui/js/directives/treeherder/clonejobs.js b/ui/js/directives/treeherder/clonejobs.js index ecd2a322c..b1e5a6903 100644 --- a/ui/js/directives/treeherder/clonejobs.js +++ b/ui/js/directives/treeherder/clonejobs.js @@ -773,7 +773,7 @@ treeherder.directive('thCloneJobs', [ //Add platforms platformTdEl = $(platformInterpolator( - {'name':platformName, 'option':option, 'id':platformId} + { name: platformName, option: option, id: platformId } )); rowEl.append(platformTdEl); @@ -810,7 +810,7 @@ treeherder.directive('thCloneJobs', [ scrollOffset = -200; } if (!isOnScreen(el)) { - $('.th-global-content').scrollTo(el, duration, {offset: scrollOffset}); + $('.th-global-content').scrollTo(el, duration, { offset: scrollOffset }); } } @@ -975,15 +975,15 @@ treeherder.directive('thCloneJobs', [ // We first determine whether the row has some visible element var anyVisible = _.some(platform.groups, function (jobGroup) { - return _.some(jobGroup.jobs, {visible: true}); + return _.some(jobGroup.jobs, { visible: true }); }); var display_style = anyVisible ? "table-row" : "none"; var rowHtml = '