From 455aa1cd1fa6ae9077b54b4e46fd35352877c55f Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 17 Jun 2014 18:33:19 +0600 Subject: [PATCH] SONAR-5209 File dashboard integration --- sonar-server/Gruntfile.coffee | 4 ++ .../src/main/coffee/dashboard/file-app.coffee | 55 +++++++++++++++++++ .../src/main/coffee/drilldown/app.coffee | 3 - .../app/views/dashboard/no_dashboard.html.erb | 12 ++-- 4 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 sonar-server/src/main/coffee/dashboard/file-app.coffee diff --git a/sonar-server/Gruntfile.coffee b/sonar-server/Gruntfile.coffee index e4705a5ad93..637192424e1 100644 --- a/sonar-server/Gruntfile.coffee +++ b/sonar-server/Gruntfile.coffee @@ -183,6 +183,10 @@ module.exports = (grunt) -> name: 'drilldown/app' out: '<%= pkg.assets %>build/js/drilldown/app.js' + dashboardFile: options: + name: 'dashboard/file-app' + out: '<%= pkg.assets %>build/js/dashboard/file-app.js' + handlebars: options: diff --git a/sonar-server/src/main/coffee/dashboard/file-app.coffee b/sonar-server/src/main/coffee/dashboard/file-app.coffee new file mode 100644 index 00000000000..e7354ccbaef --- /dev/null +++ b/sonar-server/src/main/coffee/dashboard/file-app.coffee @@ -0,0 +1,55 @@ +requirejs.config + baseUrl: "#{baseUrl}/js" + + paths: + 'backbone': 'third-party/backbone' + 'backbone.marionette': 'third-party/backbone.marionette' + 'handlebars': 'third-party/handlebars' + 'jquery.mockjax': 'third-party/jquery.mockjax' + + shim: + 'backbone.marionette': + deps: ['backbone'] + exports: 'Marionette' + 'backbone': + exports: 'Backbone' + 'handlebars': + exports: 'Handlebars' + + +requirejs [ + 'backbone.marionette' + 'component-viewer/main' +], ( + Marionette + ComponentViewer +) -> + + $ = jQuery + App = new Marionette.Application() + + + App.addRegions + viewerRegion: '#accordion-panel' + + + App.requestComponentViewer = -> + unless App.componentViewer? + App.componentViewer = new ComponentViewer() + App.viewerRegion.show App.componentViewer + App.componentViewer + + + + App.addInitializer -> + viewer = App.requestComponentViewer() + viewer.open(window.fileKey).done -> viewer.showAllLines() + + + # Message bundles + l10nXHR = window.requestMessages() + + + $.when(l10nXHR).done -> + # Start the application + App.start() diff --git a/sonar-server/src/main/coffee/drilldown/app.coffee b/sonar-server/src/main/coffee/drilldown/app.coffee index 189886cc668..77f163f96cb 100644 --- a/sonar-server/src/main/coffee/drilldown/app.coffee +++ b/sonar-server/src/main/coffee/drilldown/app.coffee @@ -81,8 +81,5 @@ requirejs [ $.when(l10nXHR).done -> - # Remove the initial spinner - $('#coding-rules-page-loader').remove() - # Start the application App.start() diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb index 57fedba78a2..c588a50d1e0 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/no_dashboard.html.erb @@ -1,6 +1,11 @@ +<% content_for :script do %> + +<% end %> + <%= render :partial => 'gwt/base', :locals => {:resource => nil, :popup => false, :metric => nil} -%> <%= render :partial => 'gwt/resource_viewers' -%> +