aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/components
diff options
context:
space:
mode:
Diffstat (limited to 'server/sonar-web/src/main/js/components')
-rw-r--r--server/sonar-web/src/main/js/components/SelectList/index.js2
-rw-r--r--server/sonar-web/src/main/js/components/source-viewer/main.js8
-rw-r--r--server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js4
-rw-r--r--server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js4
-rw-r--r--server/sonar-web/src/main/js/components/source-viewer/popups/duplication-popup.js2
5 files changed, 10 insertions, 10 deletions
diff --git a/server/sonar-web/src/main/js/components/SelectList/index.js b/server/sonar-web/src/main/js/components/SelectList/index.js
index 6c668832d43..b60aeb879c0 100644
--- a/server/sonar-web/src/main/js/components/SelectList/index.js
+++ b/server/sonar-web/src/main/js/components/SelectList/index.js
@@ -337,9 +337,9 @@ const SelectListView = Backbone.View.extend({
data[this.settings.queryParam] = query;
data.selected = 'all';
this.collection.fetch({
+ data,
url: this.settings.searchUrl,
reset: true,
- data,
success () {
that.hideFetchSpinner();
},
diff --git a/server/sonar-web/src/main/js/components/source-viewer/main.js b/server/sonar-web/src/main/js/components/source-viewer/main.js
index 84533248323..c013b8e3c53 100644
--- a/server/sonar-web/src/main/js/components/source-viewer/main.js
+++ b/server/sonar-web/src/main/js/components/source-viewer/main.js
@@ -152,9 +152,9 @@ export default Marionette.LayoutView.extend({
const url = '/api/components/app';
const data = { uuid: this.model.id };
return $.ajax({
- type: 'GET',
url,
data,
+ type: 'GET',
statusCode: {
404 () {
that.model.set({ exist: false });
@@ -425,8 +425,8 @@ export default Marionette.LayoutView.extend({
};
return $.get(url, options).done(function (data) {
const popup = new CoveragePopupView({
- collection: new Backbone.Collection(data.tests),
row,
+ collection: new Backbone.Collection(data.tests),
tests: $(e.currentTarget).data('tests'),
triggerEl: $(e.currentTarget)
});
@@ -474,9 +474,9 @@ export default Marionette.LayoutView.extend({
return isOk;
});
const popup = new DuplicationPopupView({
+ inRemovedComponent,
triggerEl: $(e.currentTarget),
model: this.model,
- inRemovedComponent,
collection: new Backbone.Collection(blocks)
});
popup.render();
@@ -503,9 +503,9 @@ export default Marionette.LayoutView.extend({
const that = this;
const line = $(e.currentTarget).data('line-number');
const popup = new LineActionsPopupView({
+ line,
triggerEl: $(e.currentTarget),
model: this.model,
- line,
row: $(e.currentTarget).closest('.source-line')
});
popup.on('onManualIssueAdded', function (issue) {
diff --git a/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js b/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js
index 5cb86419f15..bfcbe8d3126 100644
--- a/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js
+++ b/server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js
@@ -205,9 +205,9 @@ export default ModalView.extend({
});
that.model.set({
issuesFacets,
- issuesCount: data.total,
maxCountBySeverity,
- maxCountByTag
+ maxCountByTag,
+ issuesCount: data.total
});
});
},
diff --git a/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js b/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js
index 81d3a175c9a..94e8c5d3689 100644
--- a/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js
+++ b/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js
@@ -61,8 +61,8 @@ export default Popup.extend({
});
return {
testFiles,
- tests: this.options.tests,
- row
+ row,
+ tests: this.options.tests
};
}
});
diff --git a/server/sonar-web/src/main/js/components/source-viewer/popups/duplication-popup.js b/server/sonar-web/src/main/js/components/source-viewer/popups/duplication-popup.js
index 43a3a29b475..6aa3f7e2c7e 100644
--- a/server/sonar-web/src/main/js/components/source-viewer/popups/duplication-popup.js
+++ b/server/sonar-web/src/main/js/components/source-viewer/popups/duplication-popup.js
@@ -54,8 +54,8 @@ export default Popup.extend({
return '' + a + b + c;
});
return {
- component: this.model.toJSON(),
duplications,
+ component: this.model.toJSON(),
inRemovedComponent: this.options.inRemovedComponent
};
}