Merge branch '1.3'

Author: sebastianbergmann

src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist

@@ -144,8 +144,8 @@
   <script src="{{path_to_root}}js/d3.min.js" type="text/javascript"></script>
   <script src="{{path_to_root}}js/nv.d3.min.js" type="text/javascript"></script>
   <script type="text/javascript">
-$(document).ready(function() {{
-  nv.addGraph(function() {{
+$(document).ready(function() {
+  nv.addGraph(function() {
     var chart = nv.models.multiBarChart();
     chart.tooltips(false)
       .showControls(false)
@@ -161,9 +161,9 @@ $(document).ready(function() {{
     nv.utils.windowResize(chart.update);
 
     return chart;
-  }});
+  });
 
-  nv.addGraph(function() {{
+  nv.addGraph(function() {
     var chart = nv.models.multiBarChart();
     chart.tooltips(false)
       .showControls(false)
@@ -179,9 +179,9 @@ $(document).ready(function() {{
     nv.utils.windowResize(chart.update);
 
     return chart;
-  }});
+  });
 
-  function getCoverageDistributionData(data, label) {{
+  function getCoverageDistributionData(data, label) {
     var labels = [
       '0%',
       '0-10%',
@@ -197,28 +197,28 @@ $(document).ready(function() {{
       '100%'
     ];
     var values = [];
-    $.each(labels, function(key) {{
-      values.push({{x: labels[key], y: data[key]}});
-    }});
+    $.each(labels, function(key) {
+      values.push({x: labels[key], y: data[key]});
+    });
 
     return [
-      {{
+      {
         key: label,
         values: values,
         color: "#4572A7"
-      }}
+      }
     ];
-  }}
-  nv.addGraph(function() {{
+  }
+  nv.addGraph(function() {
     var chart = nv.models.scatterChart()
       .showDistX(true)
       .showDistY(true)
       .showLegend(false)
       .forceX([0, 100]);
     chart.scatter.onlyCircles(false);
-    chart.tooltipContent(function(key, y, e, graph) {{
+    chart.tooltipContent(function(key, y, e, graph) {
       return '<p>' + graph.point.class + '</p>';
-    }});
+    });
 
     chart.xAxis.axisLabel('Code Coverage (in percent)');
     chart.yAxis.axisLabel('Cyclomatic Complexity');
@@ -232,18 +232,18 @@ $(document).ready(function() {{
     nv.utils.windowResize(chart.update);
 
     return chart;
-  }});
+  });
 
-  nv.addGraph(function() {{
+  nv.addGraph(function() {
     var chart = nv.models.scatterChart()
       .showDistX(true)
       .showDistY(true)
       .showLegend(false)
       .forceX([0, 100]);
     chart.scatter.onlyCircles(false);
-    chart.tooltipContent(function(key, y, e, graph) {{
+    chart.tooltipContent(function(key, y, e, graph) {
       return '<p>' + graph.point.class + '</p>';
-    }});
+    });
 
     chart.xAxis.axisLabel('Code Coverage (in percent)');
     chart.yAxis.axisLabel('Method Complexity');
@@ -257,30 +257,30 @@ $(document).ready(function() {{
     nv.utils.windowResize(chart.update);
 
     return chart;
-  }});
+  });
 
-  function getComplexityData(data, label) {{
+  function getComplexityData(data, label) {
     var values = [];
-    $.each(data, function(key) {{
+    $.each(data, function(key) {
       var value = Math.round(data[key][0]*100) / 100;
-      values.push({{
+      values.push({
         x: value,
         y: data[key][1],
         class: data[key][2],
         size: 0.05,
         shape: 'diamond'
-      }});
-    }});
+      });
+    });
 
     return [
-      {{
+      {
         key: label,
         values: values,
         color: "#4572A7"
-      }}
+      }
     ];
-  }}
-}});
+  }
+});
   </script>
  </body>
 </html>