From 22e4bf73fffa5a4a4b68a1d5c44548d6ed4383f7 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 6 Jan 2015 10:39:33 +0100 Subject: [PATCH] SONAR-5884 Clean up --- server/sonar-web/src/main/js/drilldown/app.js | 5 ++--- server/sonar-web/src/main/js/source-viewer/app.js | 2 +- server/sonar-web/src/main/js/source-viewer/viewer.js | 7 ++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/server/sonar-web/src/main/js/drilldown/app.js b/server/sonar-web/src/main/js/drilldown/app.js index e06045afb72..dc86cfc6749 100644 --- a/server/sonar-web/src/main/js/drilldown/app.js +++ b/server/sonar-web/src/main/js/drilldown/app.js @@ -34,11 +34,10 @@ requirejs([ App.addInitializer(function () { $('.js-drilldown-link').on('click', function (e) { e.preventDefault(); - var key = $(e.currentTarget).data('key'), - uuid = $(e.currentTarget).data('uuid'), + var uuid = $(e.currentTarget).data('uuid'), viewer = new SourceViewer(); App.viewerRegion.show(viewer); - viewer.open(uuid, key); + viewer.open(uuid); if (typeof window.drilldown.period === 'number') { viewer.on('loaded', function () { viewer.filterLinesByPeriod(window.drilldown.period); diff --git a/server/sonar-web/src/main/js/source-viewer/app.js b/server/sonar-web/src/main/js/source-viewer/app.js index 44cd085f914..6a4cab910ba 100644 --- a/server/sonar-web/src/main/js/source-viewer/app.js +++ b/server/sonar-web/src/main/js/source-viewer/app.js @@ -34,7 +34,7 @@ requirejs([ App.addInitializer(function () { var viewer = new SourceViewer(); App.viewerRegion.show(viewer); - viewer.open(window.file.uuid, window.file.key); + viewer.open(window.file.uuid); if (typeof window.file.line === 'number') { viewer.on('loaded', function () { viewer 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 7269bd9efed..0056db64dfd 100644 --- a/server/sonar-web/src/main/js/source-viewer/viewer.js +++ b/server/sonar-web/src/main/js/source-viewer/viewer.js @@ -101,7 +101,7 @@ define([ this.bindScrollEvents(); }, - open: function (id, key) { + open: function (id) { var that = this, r = window.process.addBackgroundProcess(), finalize = function () { @@ -114,10 +114,7 @@ define([ this.model .clear() .set(_.result(this.model, 'defaults')) - .set({ - uuid: id, - key: key - }); + .set({ uuid: id }); this.requestComponent().done(function () { that.requestSource() .done(finalize) -- 2.39.5