diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2013-10-29 15:26:06 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2013-10-29 15:26:12 +0100 |
| commit | ceace96010ebf0f6defba7fda8c7a5696d32ee7d (patch) | |
| tree | 28824bf451f9f2ae1a1e5112039bb4adaf6dfe6b | |
| parent | 286a812c86590a8232498e5ef57461c33e5c58ab (diff) | |
| download | sonarqube-ceace96010ebf0f6defba7fda8c7a5696d32ee7d.tar.gz sonarqube-ceace96010ebf0f6defba7fda8c7a5696d32ee7d.zip | |
SONAR-4817 Fix timeline widget for IT
| -rw-r--r-- | plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb | 2 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/javascripts/widgets/timeline.js | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb index dae64bfef9d..343971faa1e 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb @@ -167,7 +167,7 @@ <% else %> <% timeline = 'timeline' + widget.id.to_s %> - <div id="timeline-chart-<%= widget.id -%>"></div> + <div id="timeline-chart-<%= widget.id -%>" style="height: <%= chartHeight -%>px;"></div> <script> function d(y, m, d, h, min, s) { return new Date(y, m, d, h, min, s); diff --git a/sonar-server/src/main/webapp/javascripts/widgets/timeline.js b/sonar-server/src/main/webapp/javascripts/widgets/timeline.js index cc70e097367..282cc9abcc0 100644 --- a/sonar-server/src/main/webapp/javascripts/widgets/timeline.js +++ b/sonar-server/src/main/webapp/javascripts/widgets/timeline.js @@ -148,13 +148,7 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; this.timeAxis = d3.svg.axis() .scale(this.time) .orient('bottom') - .tickFormat(function(d) { - var format = d.getMonth() === 0 ? - d3.time.format('%Y') : - d3.time.format('%b'); - - return format(d); - }); + .ticks(5); // Configure lines and points |