Bug 1364894 - eslint --fix for object-property-newline

https://eslint.org/docs/rules/object-property-newline
mozilla · Oct 3, 2017 · 6cd4ddf · 6cd4ddf
1 parent ff63391
commit 6cd4ddf
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 25 deletions.
diff --git a/ui/js/controllers/perf/compare.js b/ui/js/controllers/perf/compare.js
@@ -247,8 +247,10 @@ perf.controller('CompareResultsCtrl', [
 
                 PhSeries.getSeriesList(
                     $scope.originalProject.name,
-                    { interval: timeRange, subtests: 0,
-                        framework: $scope.filterOptions.framework.id
+                    {
+                        interval: timeRange,
+                        subtests: 0,
+                        framework: $scope.filterOptions.framework.id,
                     }).then(
                         function (originalSeriesList) {
                             $scope.platformList = _.uniq(
@@ -271,8 +273,11 @@ perf.controller('CompareResultsCtrl', [
 
                             PhSeries.getSeriesList(
                                 $scope.newProject.name,
-                                { interval: timeRange, subtests: 0,
-                                    framework: $scope.filterOptions.framework.id }).then(
+                                {
+                                    interval: timeRange,
+                                    subtests: 0,
+                                    framework: $scope.filterOptions.framework.id,
+                                }).then(
                                     function (newSeriesList) {
                                         $scope.platformList = _.union(
                                             $scope.platformList,
@@ -307,22 +312,28 @@ perf.controller('CompareResultsCtrl', [
                 }).then(function (resultsMap) {
                     var originalResultsMap = resultsMap;
                     PhSeries.getSeriesList(
-                        $scope.newProject.name, {
-                            interval: $scope.selectedTimeRange.value, subtests: 0,
-                            framework: $scope.filterOptions.framework.id }).then(
-                                function (newSeriesList) {
-                                    $scope.platformList = _.union($scope.platformList,
-                                        _.uniq(_.map(newSeriesList, 'platform')));
-                                    $scope.testList = _.union($scope.testList,
-                                        _.uniq(_.map(newSeriesList, 'name')));
-                                    return PhCompare.getResultsMap($scope.newProject.name,
+                        $scope.newProject.name,
+                        {
+                            interval: $scope.selectedTimeRange.value,
+                            subtests: 0,
+                            framework: $scope.filterOptions.framework.id,
+                        }).then(function (newSeriesList) {
+                            $scope.platformList = _.union(
+                                $scope.platformList,
+                                _.uniq(_.map(newSeriesList, 'platform'))
+                            );
+                            $scope.testList = _.union(
+                                $scope.testList,
+                                _.uniq(_.map(newSeriesList, 'name'))
+                            );
+                            return PhCompare.getResultsMap($scope.newProject.name,
                                                             newSeriesList,
                                                             { pushIDs: [$scope.newResultSet.id] });
-                                }).then(function (resultMaps) {
-                                    var newResultsMap = resultMaps[$scope.newResultSet.id];
-                                    $scope.dataLoading = false;
-                                    displayResults(originalResultsMap, newResultsMap);
-                                });
+                        }).then(function (resultMaps) {
+                            var newResultsMap = resultMaps[$scope.newResultSet.id];
+                            $scope.dataLoading = false;
+                            displayResults(originalResultsMap, newResultsMap);
+                        });
                 });
             }
         }

diff --git a/ui/js/controllers/perf/graphs.js b/ui/js/controllers/perf/graphs.js
@@ -198,12 +198,23 @@ perf.controller('GraphsCtrl', [
                     // get new tip position after transform
                     tipPosition = getTipPosition(tip, x, y, 10);
                     if (tip.css('visibility') === 'hidden') {
-                        tip.css({ opacity: 0, visibility: 'visible', left: tipPosition.left,
-                            top: tipPosition.top + 10 });
-                        tip.animate({ opacity: 1, left: tipPosition.left,
-                            top: tipPosition.top }, 250);
+                        tip.css({
+                            opacity: 0,
+                            visibility: 'visible',
+                            left: tipPosition.left,
+                            top: tipPosition.top + 10,
+                        });
+                        tip.animate({
+                            opacity: 1,
+                            left: tipPosition.left,
+                            top: tipPosition.top
+                        }, 250);
                     } else {
-                        tip.css({ opacity: 1, left: tipPosition.left, top: tipPosition.top });
+                        tip.css({
+                            opacity: 1,
+                            left: tipPosition.left,
+                            top: tipPosition.top,
+                        });
                     }
                 });
             }, 250);
@@ -1086,7 +1097,8 @@ perf.controller('TestChooserCtrl', ['$scope', '$uibModalInstance', '$http',
                     }
                     PhSeries.getSeriesList(
                         $scope.selectedProject.name,
-                        { interval: $scope.timeRange, platform: $scope.selectedPlatform,
+                        { interval: $scope.timeRange,
+                            platform: $scope.selectedPlatform,
                             framework: $scope.selectedFramework.id,
                             subtests: $scope.includeSubtests ? 1 : 0 }).then(function (seriesList) {
                                 $scope.unselectedTestList = _.sortBy(

diff --git a/ui/js/directives/treeherder/clonejobs.js b/ui/js/directives/treeherder/clonejobs.js
@@ -982,7 +982,8 @@ treeherder.directive('thCloneJobs', [
                 //Add platforms
                 rowHtml += platformInterpolator(
                     {
-                        name: thPlatformName(platform.name), option: platform.option,
+                        name: thPlatformName(platform.name),
+                        option: platform.option,
                         id: thAggregateIds.getPlatformRowId(
                             resultset.id,
                             platform.name,