Author: olamy
Date: Wed Aug 8 21:00:15 2012
New Revision: 1370965
URL: http://svn.apache.org/viewvc?rev=1370965&view=rev
Log:
more navigation history
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
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=1370965&r1=1370964&r2=1370965&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
Wed Aug 8 21:00:15 2012
@@ -197,8 +197,16 @@ define("archiva.search",["jquery","i18n"
}
displayParent=function(){
-
displayArtifactVersionDetailViewModel(self.projectVersionMetadata.mavenFacet.parent.groupId,self.projectVersionMetadata.mavenFacet.parent.artifactId,
-
self.projectVersionMetadata.mavenFacet.parent.version);
+ var selectedRepo=getSelectedBrowsingRepository();
+ var location ="#artifact";
+ if (selectedRepo){
+ location+="~"+selectedRepo;
+ }
+
location+="/"+self.projectVersionMetadata.mavenFacet.parent.groupId+"/"+self.projectVersionMetadata.mavenFacet.parent.artifactId;
+ location+="/"+self.projectVersionMetadata.mavenFacet.parent.version;
+
+ window.sammyArchivaApplication.setLocation(location);
+
}
breadCrumbEntries=function(){
@@ -316,8 +324,6 @@ define("archiva.search",["jquery","i18n"
});
return;
}
-
-
if
($(e.target).attr("href")=="#artifact-details-files-content") {
displayArtifactFilesContent(self);
}
@@ -332,17 +338,37 @@ define("archiva.search",["jquery","i18n"
displayGroup=function(groupId){
- var parentBrowseViewModel=new BrowseViewModel(null,null,null);
- displayGroupDetail(groupId,parentBrowseViewModel,null);
+ var selectedRepo=getSelectedBrowsingRepository();
+ var location ="#browse";
+ if (selectedRepo){
+ location+="~"+selectedRepo;
+ }
+ location+="/"+groupId;
+
+ window.sammyArchivaApplication.setLocation(location);
}
displayArtifactDetailView=function(groupId, artifactId){
- displayArtifactDetail(groupId, artifactId);
+ var selectedRepo=getSelectedBrowsingRepository();
+ var location ="#artifact";
+ if (selectedRepo){
+ location+="~"+selectedRepo;
+ }
+ location+="/"+groupId+"/"+artifactId;
+
+ window.sammyArchivaApplication.setLocation(location);
+
}
displayArtifactVersionDetailViewModel=function(groupId,artifactId,version){
- var artifactVersionDetailViewModel = new ArtifactVersionDetailViewModel
(groupId,artifactId,version)
- artifactVersionDetailViewModel.display();
+ var selectedRepo=getSelectedBrowsingRepository();
+ var location ="#artifact";
+ if (selectedRepo){
+ location+="~"+selectedRepo;
+ }
+ location+="/"+groupId+"/"+artifactId+"/"+version;
+
+ window.sammyArchivaApplication.setLocation(location);
}
@@ -594,8 +620,15 @@ define("archiva.search",["jquery","i18n"
* @param groupId
*/
generalDisplayGroup=function(groupId) {
- var parentBrowseViewModel=new BrowseViewModel(null,null,null);
- displayGroupDetail(groupId,parentBrowseViewModel,null);
+ $.log("generalDisplayGroup");
+ var selectedRepo=getSelectedBrowsingRepository();
+ var location ="#browse";
+ if (selectedRepo){
+ location+="~"+selectedRepo;
+ }
+ location+="/"+groupId;
+
+ window.sammyArchivaApplication.setLocation(location);
}
/**
@@ -604,7 +637,14 @@ define("archiva.search",["jquery","i18n"
* @param artifactId
*/
generalDisplayArtifactDetailView=function(groupId, artifactId){
- displayArtifactDetail(groupId, artifactId);
+ var selectedRepo=getSelectedBrowsingRepository();
+ var location ="#artifact";
+ if (selectedRepo){
+ location+="~"+selectedRepo;
+ }
+ location+="/"+groupId+"/"+artifactId;
+
+ window.sammyArchivaApplication.setLocation(location);
}
/**
@@ -614,8 +654,14 @@ define("archiva.search",["jquery","i18n"
* @param version
*/
generalDisplayArtifactVersionDetailViewModel=function(groupId,artifactId,version){
- var artifactVersionDetailViewModel = new ArtifactVersionDetailViewModel
(groupId,artifactId,version)
- artifactVersionDetailViewModel.display();
+ var selectedRepo=getSelectedBrowsingRepository();
+ var location ="#artifact";
+ if (selectedRepo){
+ location+="~"+selectedRepo;
+ }
+ location+="/"+groupId+"/"+artifactId+"/"+version;
+
+ window.sammyArchivaApplication.setLocation(location);
}
goToBrowseArtifactDetail=function(groupId, artifactId,repositoryId){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html?rev=1370965&r1=1370964&r2=1370965&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Wed Aug 8 21:00:15 2012
@@ -371,7 +371,6 @@
<script id="search-results-view-grid-tmpl" type="text/html">
<thead>
<tr>
-
<th
title="${$.i18n.prop('search.artifact.results.groupId')}">${$.i18n.prop('search.artifact.results.groupId')}</th>
<th
title="${$.i18n.prop('search.artifact.results.artifactId')}">${$.i18n.prop('search.artifact.results.artifactId')}</th>
<th
title="${$.i18n.prop('search.artifact.results.version')}">${$.i18n.prop('search.artifact.results.version')}</th>
