From: Stas Vilchik Date: Mon, 4 May 2015 15:08:09 +0000 (+0200) Subject: SONAR-6215 do not show tab for currently open item X-Git-Tag: 5.2-RC1~2070 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d44b890a9e3cb980ba9ac5cbb30c30e40696c096;p=sonarqube.git SONAR-6215 do not show tab for currently open item --- diff --git a/server/sonar-web/src/main/js/workspace/main.js b/server/sonar-web/src/main/js/workspace/main.js index 594f8e783c2..6a468b36a7f 100644 --- a/server/sonar-web/src/main/js/workspace/main.js +++ b/server/sonar-web/src/main/js/workspace/main.js @@ -89,12 +89,15 @@ define([ showViewer: function (Viewer, model) { var that = this; if (this.viewerView != null) { + this.viewerView.model.trigger('hideViewer'); this.viewerView.close(); } $('.source-viewer').addClass('with-workspace'); + model.trigger('showViewer'); this.viewerView = new Viewer({ model: model }); this.viewerView .on('viewerMinimize', function () { + model.trigger('hideViewer'); that.closeComponentViewer(); }) .on('viewerClose', function (m) { diff --git a/server/sonar-web/src/main/js/workspace/views/item-view.js b/server/sonar-web/src/main/js/workspace/views/item-view.js index fd176697611..ad593a73905 100644 --- a/server/sonar-web/src/main/js/workspace/views/item-view.js +++ b/server/sonar-web/src/main/js/workspace/views/item-view.js @@ -27,7 +27,9 @@ define([ template: Templates['workspace-item'], modelEvents: { - 'change': 'render' + 'change': 'render', + 'showViewer': 'onViewerShow', + 'hideViewer': 'onViewerHide' }, events: { @@ -44,6 +46,14 @@ define([ e.preventDefault(); e.stopPropagation(); this.model.destroy(); + }, + + onViewerShow: function () { + this.$el.addClass('hidden'); + }, + + onViewerHide: function () { + this.$el.removeClass('hidden'); } });