svn commit: r1304367 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva: main.js search.js

[olamy]

Author: olamy
Date: Fri Mar 23 14:24:34 2012
New Revision: 1304367

URL: http://svn.apache.org/viewvc?rev=1304367&view=rev
Log:
avoid duplicate code

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1304367&r1=1304366&r2=1304367&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
 Fri Mar 23 14:24:34 2012
@@ -95,23 +95,7 @@ $(function() {
           displayBrowseArtifactDetail(splitted[0],splitted[1],null,null);
           return;
         } else if (splitted.length==3) {
-          var mainContent=$("#main-content");
-          mainContent.html($("#browse-tmpl" ).tmpl());
-          mainContent.find("#browse_result" ).hide();
-          mainContent.find("#browse_artifact_detail").show();
-          mainContent.find("#browse_artifact_detail").html(mediumSpinnerImg());
-          mainContent.find("#browse_breadcrumb" ).show();
-          mainContent.find("#browse_breadcrumb" ).html(mediumSpinnerImg());
-          
$.ajax("restServices/archivaServices/browseService/userRepositories", {
-              type: "GET",
-              dataType: 'json',
-              success: function(data) {
-                mainContent.find("#selected_repository" 
).html($("#selected_repository_tmpl" 
).tmpl({repositories:data,selected:repositoryId}));
-                var artifactVersionDetailViewModel=new 
ArtifactVersionDetailViewModel(splitted[0],splitted[1],splitted[2]);
-                artifactVersionDetailViewModel.display(true);
-              }
-          });
-
+          
generaldisplayArtifactDetailsVersionView(splitted[0],splitted[1],splitted[2],repositoryId);
           return;
         } else {
           displayWarningMessage( $.i18n.prop("shortcut.artifact.illegal"));

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1304367&r1=1304366&r2=1304367&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
 Fri Mar 23 14:24:34 2012
@@ -1027,34 +1027,34 @@ $(function() {
     });
 
     groupIdView=function(artifact){
-      $.log("groupIdView:"+artifact.groupId);
       displayBrowseGroupId(artifact.groupId);
     }
     artifactIdView=function(artifact){
-      $.log("artifactIdView:"+artifact.groupId);
       
displayBrowseArtifactDetail(artifact.groupId,artifact.artifactId,null,null);
     }
     artifactDetailView=function(artifact){
-      $.log("artifactDetailView:"+artifact.groupId);
-      var mainContent=$("#main-content");
-      mainContent.html($("#browse-tmpl" ).tmpl());
-      mainContent.find("#browse_result" ).hide();
-      mainContent.find("#browse_artifact_detail").show();
-      mainContent.find("#browse_artifact_detail").html(mediumSpinnerImg());
-      mainContent.find("#browse_breadcrumb" ).show();
-      mainContent.find("#browse_breadcrumb" ).html(mediumSpinnerImg());
-      $.ajax("restServices/archivaServices/browseService/userRepositories", {
-          type: "GET",
-          dataType: 'json',
-          success: function(data) {
-            mainContent.find("#selected_repository" 
).html($("#selected_repository_tmpl" ).tmpl({repositories:data,selected:null}));
-            var artifactVersionDetailViewModel=new 
ArtifactVersionDetailViewModel(artifact.groupId,artifact.artifactId,artifact.version);
-            artifactVersionDetailViewModel.display(true);
-          }
-      });
+      
generaldisplayArtifactDetailsVersionView(artifact.groupId,artifact.artifactId,artifact.version,null);
     }
   }
 
+  
generaldisplayArtifactDetailsVersionView=function(groupId,artifactId,version,repositoryId){
+    var mainContent=$("#main-content");
+    mainContent.html($("#browse-tmpl" ).tmpl());
+    mainContent.find("#browse_result" ).hide();
+    mainContent.find("#browse_artifact_detail").show();
+    mainContent.find("#browse_artifact_detail").html(mediumSpinnerImg());
+    mainContent.find("#browse_breadcrumb" ).show();
+    mainContent.find("#browse_breadcrumb" ).html(mediumSpinnerImg());
+    $.ajax("restServices/archivaServices/browseService/userRepositories", {
+        type: "GET",
+        dataType: 'json',
+        success: function(data) {
+          mainContent.find("#selected_repository" 
).html($("#selected_repository_tmpl" 
).tmpl({repositories:data,selected:repositoryId}));
+          var artifactVersionDetailViewModel=new 
ArtifactVersionDetailViewModel(groupId,artifactId,version);
+          artifactVersionDetailViewModel.display(true);
+        }
+    });
+  }
 
   SearchViewModel=function(){
     var self=this;