From 689c237e415710257a2d48c218f95ab279cd7a8a Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 25 Apr 2014 14:27:22 +0600 Subject: [PATCH] Fix quality flaws --- .../main/js/common/handlebars-extensions.js | 2 +- sonar-server/src/main/js/issues/extra.js | 7 +++--- .../navigator/filters/action-plan-filters.js | 8 +++++-- .../navigator/filters/ajax-select-filters.js | 7 +++++- .../js/navigator/filters/checkbox-filters.js | 7 +++++- .../js/navigator/filters/choice-filters.js | 8 +++++-- .../js/navigator/filters/favorite-filters.js | 8 ++++++- .../js/navigator/filters/metric-filters.js | 3 ++- .../filters/more-criteria-filters.js | 6 ++++- .../main/js/navigator/filters/rule-filters.js | 6 ++++- sonar-server/src/main/js/sortable.js | 22 +++++++++---------- .../src/main/js/widgets/bubble-chart.js | 21 +++++++++++++----- sonar-server/src/main/js/widgets/histogram.js | 10 ++++++--- sonar-server/src/main/js/widgets/pie-chart.js | 11 +++++++--- .../src/main/js/widgets/stack-area.js | 8 +++++-- sonar-server/src/main/js/widgets/timeline.js | 4 +++- 16 files changed, 98 insertions(+), 40 deletions(-) diff --git a/sonar-server/src/main/js/common/handlebars-extensions.js b/sonar-server/src/main/js/common/handlebars-extensions.js index 3dde8c8ce1d..9f3c99dda0e 100644 --- a/sonar-server/src/main/js/common/handlebars-extensions.js +++ b/sonar-server/src/main/js/common/handlebars-extensions.js @@ -168,7 +168,7 @@ define(['handlebars'], function (Handlebars) { lineNumber: line, code: code, scm: (scm && scm[line]) ? { author: scm[line][0], date: scm[line][1] } : undefined - } + }; }); return sources.reduce(function(prev, current, index) { diff --git a/sonar-server/src/main/js/issues/extra.js b/sonar-server/src/main/js/issues/extra.js index aff0dfcce54..8ac8585d0d1 100644 --- a/sonar-server/src/main/js/issues/extra.js +++ b/sonar-server/src/main/js/issues/extra.js @@ -468,8 +468,9 @@ define( changeEnabled: function () { var disabledFilters = _.reject(this.collection.where({ enabled: false }), function (filter) { - return filter.get('type') === require('navigator/filters/more-criteria-filters').MoreCriteriaFilterView || - filter.get('type') === ReadOnlyFilterView; + return filter.get('type') === + require('navigator/filters/more-criteria-filters').MoreCriteriaFilterView || + filter.get('type') === ReadOnlyFilterView; }); if (disabledFilters.length === 0) { @@ -639,7 +640,7 @@ define( return { key: tokens[0], value: decodeURIComponent(tokens[1]) - } + }; }); }, diff --git a/sonar-server/src/main/js/navigator/filters/action-plan-filters.js b/sonar-server/src/main/js/navigator/filters/action-plan-filters.js index 7503e344d2a..489cb9de39c 100644 --- a/sonar-server/src/main/js/navigator/filters/action-plan-filters.js +++ b/sonar-server/src/main/js/navigator/filters/action-plan-filters.js @@ -1,4 +1,8 @@ -define(['backbone', 'navigator/filters/base-filters', 'navigator/filters/choice-filters'], function (Backbone, BaseFilters, ChoiceFilters) { +define([ + 'backbone', + 'navigator/filters/base-filters', + 'navigator/filters/choice-filters' +], function (Backbone, BaseFilters, ChoiceFilters) { return ChoiceFilters.ChoiceFilterView.extend({ @@ -68,7 +72,7 @@ define(['backbone', 'navigator/filters/base-filters', 'navigator/filters/choice- id: plan.key, text: plan.name, category: plan.fDeadLine - } + }; })); _.each(that.model.get('choices'), function(v, k) { that.choices.add(new Backbone.Model({ id: k, text: v })); diff --git a/sonar-server/src/main/js/navigator/filters/ajax-select-filters.js b/sonar-server/src/main/js/navigator/filters/ajax-select-filters.js index 0f6c130e347..ab8308da99a 100644 --- a/sonar-server/src/main/js/navigator/filters/ajax-select-filters.js +++ b/sonar-server/src/main/js/navigator/filters/ajax-select-filters.js @@ -1,4 +1,9 @@ -define(['backbone', 'navigator/filters/base-filters', 'navigator/filters/choice-filters', 'common/handlebars-extensions'], function (Backbone, BaseFilters, ChoiceFilters) { +define([ + 'backbone', + 'navigator/filters/base-filters', + 'navigator/filters/choice-filters', + 'common/handlebars-extensions' +], function (Backbone, BaseFilters, ChoiceFilters) { var PAGE_SIZE = 100; diff --git a/sonar-server/src/main/js/navigator/filters/checkbox-filters.js b/sonar-server/src/main/js/navigator/filters/checkbox-filters.js index 025ce9dc649..33f0f38f5d9 100644 --- a/sonar-server/src/main/js/navigator/filters/checkbox-filters.js +++ b/sonar-server/src/main/js/navigator/filters/checkbox-filters.js @@ -1,4 +1,9 @@ -define(['backbone', 'backbone.marionette', 'navigator/filters/base-filters', 'common/handlebars-extensions'], function (Backbone, Marionette, BaseFilters) { +define([ + 'backbone', + 'backbone.marionette', + 'navigator/filters/base-filters', + 'common/handlebars-extensions' +], function (Backbone, Marionette, BaseFilters) { return BaseFilters.BaseFilterView.extend({ template: getTemplate('#checkbox-filter-template'), diff --git a/sonar-server/src/main/js/navigator/filters/choice-filters.js b/sonar-server/src/main/js/navigator/filters/choice-filters.js index ababc20d875..b2333c0ebe2 100644 --- a/sonar-server/src/main/js/navigator/filters/choice-filters.js +++ b/sonar-server/src/main/js/navigator/filters/choice-filters.js @@ -1,4 +1,8 @@ -define(['handlebars', 'navigator/filters/base-filters', 'common/handlebars-extensions'], function (Handlebars, BaseFilters) { +define([ + 'handlebars', + 'navigator/filters/base-filters', + 'common/handlebars-extensions' +], function (Handlebars, BaseFilters) { var DetailsChoiceFilterView = BaseFilters.DetailsFilterView.extend({ template: getTemplate('#choice-filter-template'), @@ -57,7 +61,7 @@ define(['handlebars', 'navigator/filters/base-filters', 'common/handlebars-exten }); } else { this.options.filterView.choices.filter(function(item) { - return item.get('id')[0] === '!' + return item.get('id')[0] === '!'; }).forEach(function(item) { item.set('checked', false); }); diff --git a/sonar-server/src/main/js/navigator/filters/favorite-filters.js b/sonar-server/src/main/js/navigator/filters/favorite-filters.js index a5c8134b07d..eda16b3cb66 100644 --- a/sonar-server/src/main/js/navigator/filters/favorite-filters.js +++ b/sonar-server/src/main/js/navigator/filters/favorite-filters.js @@ -1,4 +1,10 @@ -define(['backbone', 'backbone.marionette', 'navigator/filters/base-filters', 'navigator/filters/choice-filters', 'common/handlebars-extensions'], function (Backbone, Marionette, BaseFilters, ChoiceFilters) { +define([ + 'backbone', + 'backbone.marionette', + 'navigator/filters/base-filters', + 'navigator/filters/choice-filters', + 'common/handlebars-extensions' +], function (Backbone, Marionette, BaseFilters, ChoiceFilters) { var DetailsFavoriteFilterView = BaseFilters.DetailsFilterView.extend({ template: getTemplate('#favorite-details-filter-template'), diff --git a/sonar-server/src/main/js/navigator/filters/metric-filters.js b/sonar-server/src/main/js/navigator/filters/metric-filters.js index cac789dc4aa..6a3df26e49e 100644 --- a/sonar-server/src/main/js/navigator/filters/metric-filters.js +++ b/sonar-server/src/main/js/navigator/filters/metric-filters.js @@ -107,7 +107,8 @@ define(['navigator/filters/base-filters', 'common/handlebars-extensions'], funct renderValue: function() { return this.isDefaultValue() ? window.SS.phrases.notSet : - this.model.get('value').metricText + ' ' + this.model.get('value').opText + ' ' + this.model.get('value').valText; + this.model.get('value').metricText + ' ' + this.model.get('value').opText + ' ' + + this.model.get('value').valText; }, diff --git a/sonar-server/src/main/js/navigator/filters/more-criteria-filters.js b/sonar-server/src/main/js/navigator/filters/more-criteria-filters.js index 3bfed0fe484..d76cdde9ef2 100644 --- a/sonar-server/src/main/js/navigator/filters/more-criteria-filters.js +++ b/sonar-server/src/main/js/navigator/filters/more-criteria-filters.js @@ -1,4 +1,8 @@ -define(['navigator/filters/base-filters', 'navigator/filters/choice-filters', 'common/handlebars-extensions'], function (BaseFilters, ChoiceFilters) { +define([ + 'navigator/filters/base-filters', + 'navigator/filters/choice-filters', + 'common/handlebars-extensions' +], function (BaseFilters, ChoiceFilters) { var DetailsMoreCriteriaFilterView = ChoiceFilters.DetailsChoiceFilterView.extend({ template: getTemplate('#more-criteria-details-filter-template'), diff --git a/sonar-server/src/main/js/navigator/filters/rule-filters.js b/sonar-server/src/main/js/navigator/filters/rule-filters.js index aed4b8d894a..0c88965fc7c 100644 --- a/sonar-server/src/main/js/navigator/filters/rule-filters.js +++ b/sonar-server/src/main/js/navigator/filters/rule-filters.js @@ -1,4 +1,8 @@ -define(['backbone', 'navigator/filters/base-filters', 'navigator/filters/ajax-select-filters'], function (Backbone, BaseFilters, AjaxSelectFilters) { +define([ + 'backbone', + 'navigator/filters/base-filters', + 'navigator/filters/ajax-select-filters' +], function (Backbone, BaseFilters, AjaxSelectFilters) { var RuleSuggestions = AjaxSelectFilters.Suggestions.extend({ diff --git a/sonar-server/src/main/js/sortable.js b/sonar-server/src/main/js/sortable.js index 6f3eae3147d..edc48d12190 100644 --- a/sonar-server/src/main/js/sortable.js +++ b/sonar-server/src/main/js/sortable.js @@ -1,6 +1,6 @@ (function($) { - function _stripe(rows) { + function stripe(rows) { rows.each(function(index) { $(this).toggleClass('rowodd', index % 2 === 0); $(this).toggleClass('roweven', index % 2 !== 0); @@ -8,15 +8,15 @@ } - function _getValue(cell) { + function getValue(cell) { return cell.attr('x') || $.trim(cell.text()) || ''; } - function _sort(container, rows, cellIndex, order) { + function sort(container, rows, cellIndex, order) { var sortArray = rows.map(function(index) { var cell = $(this).find('td').eq(cellIndex); - return { index: index, value: _getValue(cell) }; + return { index: index, value: getValue(cell) }; }).get(); Array.prototype.sort.call(sortArray, function(a, b) { @@ -35,11 +35,11 @@ newRows = newRows.add(row); }); - _stripe(newRows); + stripe(newRows); } - function _markSorted(headCells, cell, asc) { + function markSorted(headCells, cell, asc) { headCells.removeClass('sortasc sortdesc'); cell.toggleClass('sortasc', asc); cell.toggleClass('sortdesc', !asc); @@ -56,17 +56,17 @@ 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); + markSorted(headCells, $(this), asc); + sort(tbody, rows, headCells.index($(this)), asc ? 1 : -1); }); var sortFirst = headCells.filter('[class^=sortfirst],[class*=sortfirst]'); if (sortFirst.length > 0) { var asc = sortFirst.is('.sortfirstasc'); - _markSorted(headCells, sortFirst, asc); - _sort(tbody, rows, headCells.index(sortFirst), asc ? 1 : -1); + markSorted(headCells, sortFirst, asc); + sort(tbody, rows, headCells.index(sortFirst), asc ? 1 : -1); } else { - _stripe(rows); + stripe(rows); } }); }; diff --git a/sonar-server/src/main/js/widgets/bubble-chart.js b/sonar-server/src/main/js/widgets/bubble-chart.js index 3d60d877944..43ef2b78f3c 100644 --- a/sonar-server/src/main/js/widgets/bubble-chart.js +++ b/sonar-server/src/main/js/widgets/bubble-chart.js @@ -130,19 +130,19 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; this.x .domain(d3.extent(this.components(), function (d) { - return widget.getXMetric(d) + return widget.getXMetric(d); })) .range([0, this.availableWidth]); this.y .domain(d3.extent(this.components(), function (d) { - return widget.getYMetric(d) + return widget.getYMetric(d); })) .range([this.availableHeight, 0]); this.size .domain(d3.extent(this.components(), function (d) { - return widget.getSizeMetric(d) + return widget.getSizeMetric(d); })) .range([5, 45]); @@ -201,9 +201,18 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; widget.infoDate.text(d.longName); var metricLines = [ - { metric: widget.metrics()[widget.xMetric].name, value: d.measures[widget.xMetric].fval }, - { metric: widget.metrics()[widget.yMetric].name, value: d.measures[widget.yMetric].fval }, - { metric: widget.metrics()[widget.sizeMetric].name, value: (!!d.measures[widget.sizeMetric] ? d.measures[widget.sizeMetric].fval : '–') } + { + metric: widget.metrics()[widget.xMetric].name, + value: d.measures[widget.xMetric].fval + }, + { + metric: widget.metrics()[widget.yMetric].name, + value: d.measures[widget.yMetric].fval + }, + { + metric: widget.metrics()[widget.sizeMetric].name, + value: (!!d.measures[widget.sizeMetric] ? d.measures[widget.sizeMetric].fval : '–') + } ]; var lastX = 0; diff --git a/sonar-server/src/main/js/widgets/histogram.js b/sonar-server/src/main/js/widgets/histogram.js index bbef0380f31..41080147690 100644 --- a/sonar-server/src/main/js/widgets/histogram.js +++ b/sonar-server/src/main/js/widgets/histogram.js @@ -65,7 +65,7 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; container = d3.select(container); var validData = this.components().reduce(function(p, c) { - return p && !!c.measures[widget.metricsPriority()[0]] + return p && !!c.measures[widget.metricsPriority()[0]]; }, true); if (!validData) { @@ -227,7 +227,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; .classed('legend-text value', true) .attr('dy', '-0.35em') .text(function(d) { return d.measures[widget.mainMetric].fval; }) - .attr('transform', function(d) { return trans(widget.legendWidth() + widget.x(widget.getMainMetric(d)) + 5, barHeight); }); + .attr('transform', function(d) { + return trans(widget.legendWidth() + widget.x(widget.getMainMetric(d)) + 5, barHeight); + }); this.bars.selectAll('rect') .transition() @@ -242,7 +244,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; this.bars.selectAll('.value') .transition() - .attr('transform', function(d) { return trans(widget.legendWidth() + widget.x(widget.getMainMetric(d)) + 5, barHeight); }); + .attr('transform', function(d) { + return trans(widget.legendWidth() + widget.x(widget.getMainMetric(d)) + 5, barHeight); + }); this.bars .exit().remove(); diff --git a/sonar-server/src/main/js/widgets/pie-chart.js b/sonar-server/src/main/js/widgets/pie-chart.js index cf7acdced26..50db9fec5fe 100644 --- a/sonar-server/src/main/js/widgets/pie-chart.js +++ b/sonar-server/src/main/js/widgets/pie-chart.js @@ -173,7 +173,8 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; this.availableHeight = this.height() - this.margin().top - this.margin().bottom; this.radius = Math.min(this.availableWidth, this.availableHeight) / 2; this._legendSize = Math.floor(this.availableHeight / this._lineHeight); - this._legendSymbols = Math.floor((this.width() - this.margin().left - this.margin().right - this.legendMargin() - 2 * this.radius) / 6.2); + this._legendSymbols = Math.floor((this.width() - this.margin().left - this.margin().right - + this.legendMargin() - 2 * this.radius) / 6.2); // Update plot @@ -231,7 +232,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; .attr('transform', trans(10, 3)); this.legends.selectAll('text') - .text(function(d) { return d.name.length > widget._legendSymbols ? d.name.substr(0, widget._legendSymbols) + '...' : d.name; }); + .text(function(d) { + return d.name.length > widget._legendSymbols ? d.name.substr(0, widget._legendSymbols) + '...' : d.name; + }); // Update details @@ -264,7 +267,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; value: (!!d.measures[m] ? d.measures[m].fval : '–') }; }); - metrics.unshift({ name: (d.name.length > widget._legendSymbols ? d.name.substr(0, widget._legendSymbols) + '...' : d.name) }); + metrics.unshift({ + name: (d.name.length > widget._legendSymbols ? d.name.substr(0, widget._legendSymbols) + '...' : d.name) + }); updateMetrics(metrics); widget.legendWrap diff --git a/sonar-server/src/main/js/widgets/stack-area.js b/sonar-server/src/main/js/widgets/stack-area.js index 8a16b7e679a..f3d16429a26 100644 --- a/sonar-server/src/main/js/widgets/stack-area.js +++ b/sonar-server/src/main/js/widgets/stack-area.js @@ -89,7 +89,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; // Configure scales var timeDomain = this.data() .map(function(_) { - return d3.extent(_, function(d) { return d.x; }); + return d3.extent(_, function(d) { + return d.x; + }); }) .reduce(function(p, c) { return p.concat(c); @@ -98,7 +100,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; this.time = d3.time.scale().domain(d3.extent(timeDomain)); this.y = d3.scale.linear() - .domain([0, d3.max(this.stackDataTop, function(d) { return d.y0 + d.y; })]) + .domain([0, d3.max(this.stackDataTop, function(d) { + return d.y0 + d.y; + })]) .nice(); this.color = function(i) { return widget.colors()[i % cl][0]; }; diff --git a/sonar-server/src/main/js/widgets/timeline.js b/sonar-server/src/main/js/widgets/timeline.js index 32d33b0abfb..7825d853ca3 100644 --- a/sonar-server/src/main/js/widgets/timeline.js +++ b/sonar-server/src/main/js/widgets/timeline.js @@ -128,7 +128,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; // Configure scales var timeDomain = this.data() .map(function(_) { - return d3.extent(_, function(d) { return d.x; }); + return d3.extent(_, function(d) { + return d.x; + }); }) .reduce(function(p, c) { return p.concat(c); -- 2.39.5