]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-5718 Better usage of background process UI
authorStas Vilchik <vilchiks@gmail.com>
Fri, 31 Oct 2014 09:40:40 +0000 (10:40 +0100)
committerStas Vilchik <vilchiks@gmail.com>
Fri, 31 Oct 2014 12:45:39 +0000 (13:45 +0100)
server/sonar-web/src/main/coffee/common/processes.coffee
server/sonar-web/src/main/coffee/issues/app.coffee
server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
sonar-core/src/main/resources/org/sonar/l10n/core.properties

index e99a2e479b19eab2774b7c96b5e2457155b791e0..74257fd7482a2813d42d2a81dd66be252fc88d1e 100644 (file)
@@ -27,7 +27,7 @@ _.extend process,
     spinner = $ '<div></div>'
     spinner.addClass 'process-spinner'
     spinner.prop 'id', id
-    spinner.text 'still working... ' + uid
+    spinner.text t 'process.still_working'
     spinner.appendTo $('body')
     setTimeout (-> spinner.addClass 'shown'), 100
 
index 775b26a4d9a0035f22da5cf46c889f44e9872170..f4f62ef85084af8b2c647d4e7a72712d56fb8cd0 100644 (file)
@@ -56,6 +56,7 @@ requirejs [
 
   $ = jQuery
   App = new Marionette.Application
+  issuesAppProcess = window.process.addBackgroundProcess()
 
 
   App.addInitializer ->
@@ -108,6 +109,7 @@ requirejs [
       key.setScope 'list'
       @router = new Router app: @
       Backbone.history.start()
+      window.process.finishBackgroundProcess issuesAppProcess
 
 
   l10nXHR = window.requestMessages()
index 70dcece4ae5744e879a4a9f2016c0a4f7694c603..3643c2080737ddadb05ce4b14095a8fc6419a9af 100644 (file)
@@ -2,6 +2,4 @@
   <script data-main="<%= ApplicationController.root_context -%>/js/issues/app" src="<%= ApplicationController.root_context -%>/js/require.js"></script>
 <% end %>
 
-<div class="issues">
-  <i class="spinner"></i>
-</div>
+<div class="issues"></div>
index d47b8900472f6ee8fc7f4f1868e7593a00e036ae..64609e256f8f80535e8c683fa70f6056eeb48ed3 100644 (file)
@@ -524,6 +524,16 @@ design.page=Design
 libraries.page=Libraries
 
 
+
+#------------------------------------------------------------------------------
+#
+# ASYNC PROCESS
+#
+#------------------------------------------------------------------------------
+
+process.still_working=Still Working...
+
+
 #------------------------------------------------------------------------------
 #
 # SESSION