diff options
8 files changed, 24 insertions, 22 deletions
diff --git a/server/sonar-web/src/main/js/navigator/filters/metric-filters.js b/server/sonar-web/src/main/js/navigator/filters/metric-filters.js index 9ce08c8ff58..13a63860c06 100644 --- a/server/sonar-web/src/main/js/navigator/filters/metric-filters.js +++ b/server/sonar-web/src/main/js/navigator/filters/metric-filters.js @@ -122,10 +122,10 @@ define([ _.sortBy( _.map( _.groupBy(metrics, 'domain'), - function (metrics, domain) { + function (metricList, domain) { return { domain: domain, - metrics: _.sortBy(metrics, 'short_name') + metrics: _.sortBy(metricList, 'short_name') }; }), 'domain' diff --git a/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js b/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js index 5cc3b76803b..3aab3651787 100644 --- a/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js +++ b/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js @@ -21,8 +21,8 @@ define([ enableByProperty: function(property) { - var filter = _.find(this.model.get('filters'), function(filter) { - return filter.get('property') === property; + var filter = _.find(this.model.get('filters'), function(f) { + return f.get('property') === property; }); if (filter) { this.enableById(filter.cid); diff --git a/server/sonar-web/src/main/js/navigator/filters/rule-filters.js b/server/sonar-web/src/main/js/navigator/filters/rule-filters.js index f5f70bbcf70..2de31b1fd3a 100644 --- a/server/sonar-web/src/main/js/navigator/filters/rule-filters.js +++ b/server/sonar-web/src/main/js/navigator/filters/rule-filters.js @@ -19,8 +19,8 @@ define([ parse: function(r) { this.more = r.p * r.ps < r.total; - return r.rules.map(function(r) { - return { id: r.key, text: r.name, category: r.lang }; + return r.rules.map(function(rule) { + return { id: rule.key, text: rule.name, category: rule.lang }; }); } diff --git a/server/sonar-web/src/main/js/sortable.js b/server/sonar-web/src/main/js/sortable.js index 487165ae22b..6bee90cc876 100644 --- a/server/sonar-web/src/main/js/sortable.js +++ b/server/sonar-web/src/main/js/sortable.js @@ -53,9 +53,9 @@ headCells.filter(':not(.nosort)').addClass('sortcol'); headCells.filter(':not(.nosort)').on('click', function() { - var asc = !$(this).is('.sortasc'); - markSorted(headCells, $(this), asc); - sort(tbody, rows, headCells.index($(this)), asc ? 1 : -1); + var toAsc = !$(this).is('.sortasc'); + markSorted(headCells, $(this), toAsc); + sort(tbody, rows, headCells.index($(this)), toAsc ? 1 : -1); }); var sortFirst = headCells.filter('[class^=sortfirst],[class*=sortfirst]'); diff --git a/server/sonar-web/src/main/js/top-search.js b/server/sonar-web/src/main/js/top-search.js index 4f4cc946347..31fad10cc27 100644 --- a/server/sonar-web/src/main/js/top-search.js +++ b/server/sonar-web/src/main/js/top-search.js @@ -45,30 +45,30 @@ var ul = $('<ul></ul>').appendTo(resultsEl); r.results.forEach(function(qualifier) { - qualifier.items.forEach(function(item, index) { - var el = $('<li></li>') + qualifier.items.forEach(function(item, idx) { + var itemEl = $('<li></li>') .data('key', item.id), q = $('<div></div>') .addClass('q') - .appendTo(el), + .appendTo(itemEl), highlightRegexp = new RegExp(term, 'gi'), highlightedName = item.name.replace(highlightRegexp, '<strong>$&</strong>'), label = $('<span></span>') .html(' ' + highlightedName) - .appendTo(el); + .appendTo(itemEl); $('<i>') .addClass('icon-qualifier-' + qualifier.q.toLowerCase()) .prependTo(label); - if (index === 0) { + if (idx === 0) { q.text(qualifier.name); } - el.appendTo(ul); + itemEl.appendTo(ul); }); }); diff --git a/server/sonar-web/src/main/js/widgets/bubble-chart.js b/server/sonar-web/src/main/js/widgets/bubble-chart.js index b31b22c9738..8ccf8435cef 100644 --- a/server/sonar-web/src/main/js/widgets/bubble-chart.js +++ b/server/sonar-web/src/main/js/widgets/bubble-chart.js @@ -214,7 +214,7 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; widget.infoDate.text(d.longName); - var metricLines = [ + var metricLineList = [ { metric: widget.metrics()[widget.xMetric].name, value: d.measures[widget.xMetric].fval @@ -231,9 +231,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; var lastX = 0; widget.infoMetrics - .data(metricLines) - .text(function(d) { return d.metric + ': ' + d.value; }) - .attr('transform', function(d, i) { + .data(metricLineList) + .text(function(m) { return m.metric + ': ' + m.value; }) + .attr('transform', function(d2, i) { var posX = lastX; lastX += widget.infoMetricWidth[i]; return trans(posX, 20); diff --git a/server/sonar-web/src/main/js/widgets/stack-area.js b/server/sonar-web/src/main/js/widgets/stack-area.js index 2e7ce5dd7a0..fdd18e6326a 100644 --- a/server/sonar-web/src/main/js/widgets/stack-area.js +++ b/server/sonar-web/src/main/js/widgets/stack-area.js @@ -54,7 +54,7 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; window.SonarWidgets.StackArea.prototype.render = function () { var widget = this, - cl = widget.colors().length; + colorsLength = widget.colors().length; this.svg = this.container.append('svg') .attr('class', 'sonar-d3'); @@ -104,7 +104,7 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; .nice(); this.color = function(i) { - return widget.colors()[i % cl][0]; + return widget.colors()[i % colorsLength][0]; }; diff --git a/server/sonar-web/src/main/js/widgets/timeline.js b/server/sonar-web/src/main/js/widgets/timeline.js index 91dc01b92d1..51a5f13e5ff 100644 --- a/server/sonar-web/src/main/js/widgets/timeline.js +++ b/server/sonar-web/src/main/js/widgets/timeline.js @@ -266,7 +266,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; d3.select(widget.gevents[0][i]).attr('y2', -12); widget.infoEvent - .text(widget.events()[i].l.map(function(d) { return d.n; }).join(', ')); + .text(widget.events()[i].l + .map(function(e) { return e.n; }) + .join(', ')); } }); }; |