From 786edd403dd156713c2661175cc87b4689f9455e Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 12 May 2014 10:24:06 +0200 Subject: [PATCH] Fix quality flaws --- sonar-server/src/main/js/issues/app.js | 2 +- sonar-server/src/main/js/issues/extra.js | 63 ++++++++++--------- sonar-server/src/main/js/widgets/pie-chart.js | 2 +- .../src/main/js/widgets/stack-area.js | 4 +- 4 files changed, 37 insertions(+), 34 deletions(-) diff --git a/sonar-server/src/main/js/issues/app.js b/sonar-server/src/main/js/issues/app.js index f32c73c1e06..28c63e3c2b2 100644 --- a/sonar-server/src/main/js/issues/app.js +++ b/sonar-server/src/main/js/issues/app.js @@ -416,7 +416,7 @@ requirejs( sort: sort.value, sortText: jQuery('[data-sort=' + sort.value + ']:first').text(), asc: asc.value === 'true' - } + }; } }; diff --git a/sonar-server/src/main/js/issues/extra.js b/sonar-server/src/main/js/issues/extra.js index 212b7d90aa8..c03cb85fde2 100644 --- a/sonar-server/src/main/js/issues/extra.js +++ b/sonar-server/src/main/js/issues/extra.js @@ -378,6 +378,38 @@ define( + var IssuesDetailsFavoriteFilterView = FavoriteFiltersModule.DetailsFavoriteFilterView.extend({ + template: Handlebars.compile(jQuery('#issues-details-favorite-filter-template').html() || ''), + + + applyFavorite: function (e) { + var id = $j(e.target).data('id'), + filter = new FavoriteFilter({ id: id }), + app = this.options.filterView.options.app; + + filter.fetch({ + success: function () { + app.state.set('search', false); + app.favoriteFilter.clear({ silent: true }); + app.favoriteFilter.set(filter.toJSON()); + } + }); + + this.options.filterView.hideDetails(); + }, + + + serializeData: function () { + return _.extend({}, this.model.toJSON(), { + items: _.sortBy(this.model.get('choices'), function(item) { + return item.name.toLowerCase(); + }) + }); + } + }); + + + var IssuesFavoriteFilterView = FavoriteFiltersModule.FavoriteFilterView.extend({ initialize: function () { @@ -545,37 +577,6 @@ define( - var IssuesDetailsFavoriteFilterView = FavoriteFiltersModule.DetailsFavoriteFilterView.extend({ - template: Handlebars.compile(jQuery('#issues-details-favorite-filter-template').html() || ''), - - - applyFavorite: function (e) { - var id = $j(e.target).data('id'), - filter = new FavoriteFilter({ id: id }), - app = this.options.filterView.options.app; - - filter.fetch({ - success: function () { - app.state.set('search', false); - app.favoriteFilter.clear({ silent: true }); - app.favoriteFilter.set(filter.toJSON()); - } - }); - - this.options.filterView.hideDetails(); - }, - - - serializeData: function () { - return _.extend({}, this.model.toJSON(), { - items: _.sortBy(this.model.get('choices'), function(item) { - return item.name.toLowerCase(); - }) - }); - } - }); - - var IssuesRouter = Backbone.Router.extend({ routes: { diff --git a/sonar-server/src/main/js/widgets/pie-chart.js b/sonar-server/src/main/js/widgets/pie-chart.js index f28f61c6d28..fd4838d4a45 100644 --- a/sonar-server/src/main/js/widgets/pie-chart.js +++ b/sonar-server/src/main/js/widgets/pie-chart.js @@ -71,7 +71,7 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; 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) { diff --git a/sonar-server/src/main/js/widgets/stack-area.js b/sonar-server/src/main/js/widgets/stack-area.js index f3d16429a26..e5174e02462 100644 --- a/sonar-server/src/main/js/widgets/stack-area.js +++ b/sonar-server/src/main/js/widgets/stack-area.js @@ -105,7 +105,9 @@ window.SonarWidgets = window.SonarWidgets == null ? {} : window.SonarWidgets; })]) .nice(); - this.color = function(i) { return widget.colors()[i % cl][0]; }; + this.color = function(i) { + return widget.colors()[i % cl][0]; + }; // Configure the axis -- 2.39.5