diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-01-08 17:16:16 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-01-08 17:16:16 +0100 |
| commit | dbb38b5f26130ed4bb9bcb4147c2c5c537c994bb (patch) | |
| tree | ba8bd6fb66786c0380e2ffd9658faa57cb542fae /server/sonar-web/src | |
| parent | 80ce9c47fc03e62a6049a23a1078bc7a3017d26a (diff) | |
| download | sonarqube-dbb38b5f26130ed4bb9bcb4147c2c5c537c994bb.tar.gz sonarqube-dbb38b5f26130ed4bb9bcb4147c2c5c537c994bb.zip | |
SONAR-5884 Fix line fading in measures drilldown page
Diffstat (limited to 'server/sonar-web/src')
3 files changed, 10 insertions, 15 deletions
diff --git a/server/sonar-web/src/main/js/drilldown/app.js b/server/sonar-web/src/main/js/drilldown/app.js index dc86cfc6749..5ed7c996cc4 100644 --- a/server/sonar-web/src/main/js/drilldown/app.js +++ b/server/sonar-web/src/main/js/drilldown/app.js @@ -38,9 +38,9 @@ requirejs([ viewer = new SourceViewer(); App.viewerRegion.show(viewer); viewer.open(uuid); - if (typeof window.drilldown.period === 'number') { + if (window.drilldown.period != null) { viewer.on('loaded', function () { - viewer.filterLinesByPeriod(window.drilldown.period); + viewer.filterLinesByDate(window.drilldown.period); }); } }); diff --git a/server/sonar-web/src/main/js/source-viewer/viewer.js b/server/sonar-web/src/main/js/source-viewer/viewer.js index 0056db64dfd..3800f3407ec 100644 --- a/server/sonar-web/src/main/js/source-viewer/viewer.js +++ b/server/sonar-web/src/main/js/source-viewer/viewer.js @@ -614,18 +614,13 @@ define([ }); }, - filterLinesByPeriod: function (periodId) { - var periods = this.model.get('periods'), - period = _.find(periods, function (candidate) { - return candidate[0] === periodId; - }); - if (period) { - var sinceDate = moment(period[2]).toDate(); - this.filterLines(function (line) { - var scmDate = moment(line.scmDate).toDate(); - return scmDate >= sinceDate; - }); - } + filterLinesByDate: function (date) { + var sinceDate = moment(date).toDate(); + this.filterLines(function (line) { + var scmDate = moment(line.scmDate).toDate(); + console.log(scmDate, sinceDate); + return scmDate >= sinceDate; + }); } }); diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb index 58f6d8cdd35..117ae080c94 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb @@ -124,7 +124,7 @@ metric: <% if @metric %>'<%= @metric.key -%>'<% else %>null<% end %>, rule: null, severity: null, - period: <% if @period %><%= @period -%><% else %>null<% end %> + period: <% if @period %>'<%= @snapshot.period_datetime(@period) -%>'<% else %>null<% end %> }; </script> |