Restore sone html ids on test viewer and display existing loading image on tab change

3 files changed, 14 insertions, 8 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb
index 453a910ecbe..1395056bad6 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb
@@ -17,7 +17,7 @@
 
     <% if @lines && @lines.size>0 %>
 
-      <table class="sources2 code" cellpadding="0" cellspacing="0" border="0">
+      <table id="sources" class="sources2 code" cellpadding="0" cellspacing="0" border="0">
         <%
            colspan=2
            gray_colspan=1
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
index 1312c866b77..4ce09357916 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
@@ -41,7 +41,7 @@
         </li>
       <% end %>
       <li>
-        <img src="<%= ApplicationController.root_context -%>/images/loading.gif" id="resource_loading" style="display:none"/>
+        <img src="<%= ApplicationController.root_context -%>/images/loading.gif" id="resource_loading" class="accordion-loading" style="display:none"/>
       </li>
     </ul>
   </div>
diff --git a/sonar-server/src/main/webapp/javascripts/application.js b/sonar-server/src/main/webapp/javascripts/application.js
index 54180770644..075869ff932 100644
--- a/sonar-server/src/main/webapp/javascripts/application.js
+++ b/sonar-server/src/main/webapp/javascripts/application.js
@@ -328,9 +328,15 @@ function openAccordionItem(url, elt, updateCurrentElement) {
   var currentElement = $j(elt).closest('.'+ htmlClass);
 
   // Display loading image
-  var loading = new Image();
-  loading.src = baseUrl + "/images/loading.gif";
-  loading.className = 'accordion-loading';
+  var loadingImg = new Image();
+  loadingImg.src = baseUrl + "/images/loading.gif";
+  loadingImg.className = 'accordion-loading';
+  var loading = $j(loadingImg);
+  var existingLoading = currentElement.find('.accordion-loading');
+  if (updateCurrentElement && existingLoading.length) {
+    existingLoading.show();
+    loading.hide();
+  }
 
   if (currentElement.length) {
     var elementToRemove = currentElement.nextAll('.'+ htmlClass);
@@ -339,10 +345,10 @@ function openAccordionItem(url, elt, updateCurrentElement) {
     }
     // Remove all accordion items after current element
     elementToRemove.remove();
-    $j(loading).insertAfter(currentElement);
+    loading.insertAfter(currentElement);
 
   } else {
-    $j(loading).insertAfter($j("#accordion-panel"));
+    loading.insertAfter($j("#accordion-panel"));
   }
 
   // Get content from url
@@ -372,7 +378,7 @@ function openAccordionItem(url, elt, updateCurrentElement) {
   }).error(function () {
         alert("Server error. Please contact your administrator.");
       }).complete(function () {
-        $j(loading).remove();
+        loading.remove();
       });
 
   return false;