Bug 1170301 - Fix display of comparison detail when grunt-compiled

ui/js/directives/perf/compare.js

@@ -5,21 +5,23 @@
 'use strict';
 
 treeherder.directive(
-  'phRunInfo', function() {
+  'phAverage', function() {
     return {
-      templateUrl: 'partials/perf/runinfo.html',
+      templateUrl: 'partials/perf/average.html',
       scope: {
-        runs: '='
+          value: '@',
+          replicates: '='
       }
     }
   });
 
 treeherder.directive(
-  'phConfidenceInfo', function() {
+  'phConfidence', function() {
     return {
       templateUrl: 'partials/perf/compareconfidence.html',
       scope: {
-        text: '@'
+          text: '@',
+          value: '@'
       }
     }
   });

ui/partials/perf/average.html

@@ -0,0 +1,3 @@
+<span ng-if="replicates.length > 0">
+  {{value|displayPrecision}}&nbsp;<span class="run-detail" tooltip="Runs: < {{replicates.join(' ')}} >">{{replicates.length}}</span>
+</span>

ui/partials/perf/compareconfidence.html

@@ -1,3 +1,3 @@
-<span ng-if="text">
-  (<abbr title="Result of running t-test on base versus new result distribution: higher values indicate greater confidence that the indicated performance difference is statistically meaningful">{{text}}</abbr>)
+<span ng-if="text && value">
+  {{value|displayPrecision}} (<abbr title="Result of running t-test on base versus new result distribution: higher values indicate greater confidence that the indicated performance difference is statistically meaningful">{{text}}</abbr>)
 </span>

ui/partials/perf/comparectrl.html

@@ -27,13 +27,15 @@
           </tr>
           <tr ng-class="getCompareClasses(compareResult, 'row')" ng-repeat="compareResult in compareResults[testName]">
             <td>{{compareResult.name}} (<a ng-href="{{compareResult.detailsLink}}">Details</a>)</td>
-            <td>{{compareResult.originalGeoMean|displayPrecision}}
-              <ph-run-info runs="compareResult.originalRuns"/>
+            <td>
+              <ph-average value="{{compareResult.originalGeoMean}}"
+                          replicates="compareResult.originalRuns"/>
             </td>
             <td ng-if="compareResult.originalStddev">+/-{{compareResult.originalStddev|displayPrecision}} ({{compareResult.originalStddevPct|displayPrecision}}%)</td>
             <td ng-if="!compareResult.originalStddev">N/A</td>
-            <td>{{compareResult.newGeoMean|displayPrecision}}
-              <ph-run-info runs="compareResult.newRuns"/>
+            <td>
+              <ph-average value="{{compareResult.newGeoMean}}"
+                          replicates="compareResult.newRuns"/>
             </td>
             <td ng-if="compareResult.newStddev">+/-{{compareResult.newStddev|displayPrecision}} ({{compareResult.newStddevPct|displayPrecision}}%)</td>
             <td ng-if="!compareResult.newStddev">N/A</td>
@@ -41,8 +43,9 @@
             <td ng-class="getCompareClasses(compareResult)">{{compareResult.deltaPercentage|displayPrecision}}%</td>
             <td ng-if="compareResult.delta" width="20%"><div ng-class="getCompareClasses(compareResult, 'bar')" style="margin-{{compareResult.marginDirection}}: {{compareResult.barGraphMargin}}%;"></div></td>
             <td ng-if="!compareResult.delta"></td>
-            <td>{{compareResult.confidence|displayPrecision}}
-              <ph-confidence-info text="{{compareResult.confidenceText}}"/>
+            <td>
+              <ph-confidence value="{{compareResult.confidence}}"
+                             text="{{compareResult.confidenceText}}"/>
             </td>
           </tr>
         </tbody>

ui/partials/perf/comparesubtestctrl.html

@@ -19,15 +19,15 @@
         <tr ng-class="getCompareClasses(compareResult, 'row')" ng-repeat="compareResult in compareResults[testName]">
           <td>{{compareResult.name}} (<a ng-href="{{compareResult.detailsLink}}">graph</a>)</td>
           <td>
-            {{compareResult.originalGeoMean|displayPrecision}}
-            <ph-run-info runs="compareResult.originalRuns"/>
+              <ph-average value="{{compareResult.originalGeoMean}}"
+                          replicates="compareResult.originalRuns"/>
           </td>
           <td ng-if="compareResult.originalStddev">+/-{{compareResult.originalStddev|displayPrecision}}
             ({{compareResult.originalStddevPct|displayPrecision}}%)</td>
           <td ng-if="!compareResult.originalStddev">N/A</td>
           <td>
-            {{compareResult.newGeoMean|displayPrecision}}
-            <ph-run-info runs="compareResult.newRuns"/>
+            <ph-average value="{{compareResult.newGeoMean}}"
+                        replicates="compareResult.newRuns"/>
           </td>
           <td ng-if="compareResult.newStddev">+/-{{compareResult.newStddev|displayPrecision}}
             ({{compareResult.newStddevPct|displayPrecision}}%)</td>
@@ -36,8 +36,9 @@
           <td ng-if="compareResult.delta" ng-class="getCompareClasses(compareResult)">{{compareResult.deltaPercentage|displayPrecision}}%</td>
           <td ng-if="compareResult.delta" width="20%"><div ng-class="getCompareClasses(compareResult, 'bar')" style="margin-{{compareResult.marginDirection}}: {{compareResult.barGraphMargin}}%;"></div></td>
           <td ng-if="!compareResult.delta"></td>
-          <td>{{compareResult.confidence|displayPrecision}}
-            <ph-confidence-info text="{{compareResult.confidenceText}}"/>
+          <td>
+            <ph-confidence value="{{compareResult.confidence|displayPrecision}}"
+                           text="{{compareResult.confidenceText}}"/>
           </td>
         </tr>
       </tbody>

ui/partials/perf/runinfo.html

@@ -1,5 +0,0 @@
-<span ng-if="runs.length > 0">
-  <span class="run-detail" tooltip="Runs: < {{runs.join(' ')}} >">
-    {{runs.length}}
-  </span>
-</span>