You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/03/19 23:46:44 UTC
svn commit: r1302699 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
search.js templates/search.html
Author: olamy
Date: Mon Mar 19 22:46:44 2012
New Revision: 1302699
URL: http://svn.apache.org/viewvc?rev=1302699&view=rev
Log:
fix BreadCrumb when displaying artifact with version detail
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/archiva/templates/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=1302699&r1=1302698&r2=1302699&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 Mon Mar 19 22:46:44 2012
@@ -150,37 +150,51 @@ $(function() {
this.groupId=groupId;
this.artifactId=artifactId;
this.version=version;
- this.artifactDetailViewModel=artifactDetailViewModel;
this.projectVersionMetadata=null;
+ breadCrumbEntries=function(){
+ var entries = calculateBreadCrumbEntries(self.groupId);
+ var artifactBreadCrumbEntry = new BreadCrumbEntry(self.groupId,self.artifactId);
+ artifactBreadCrumbEntry.artifactId=self.artifactId;
+ artifactBreadCrumbEntry.artifact=true;
+ entries.push(artifactBreadCrumbEntry);
+ entries.push(new BreadCrumbEntry("foo",self.version));
+ return entries;
+ }
this.display=function(){
- $.log("displayArtifactVersionDetail:"+self.groupId+":"+self.artifactId+":"+self.version);
- mainContent.find("#browse_artifact").hide("slide", {}, 300,function(){
- mainContent.find("#browse_artifact_detail").show();
- mainContent.find("#browse_artifact_detail").html(mediumSpinnerImg());
- var metadataUrl="restServices/archivaServices/browseService/projectVersionMetadata/"+encodeURIComponent(groupId)+"/"+encodeURIComponent(artifactId);
- var selectedRepo=getSelectedBrowsingRepository();
- if (selectedRepo){
- metadataUrl+="?repositoryId="+encodeURIComponent(selectedRepo);
- }
+ mainContent.find("#browse_breadcrumb").hide("slide", {}, 300,function(){
+ mainContent.find("#browse_artifact").hide("slide", {}, 300,function(){
+ mainContent.find("#browse_artifact_detail").show();
+ mainContent.find("#browse_artifact_detail").html(mediumSpinnerImg());
+ mainContent.find("#browse_breadcrumb" ).show();
+ mainContent.find("#browse_breadcrumb" ).html(mediumSpinnerImg());
+ var metadataUrl="restServices/archivaServices/browseService/projectVersionMetadata/"+encodeURIComponent(groupId)+"/"+encodeURIComponent(artifactId);
+ var selectedRepo=getSelectedBrowsingRepository();
+ if (selectedRepo){
+ metadataUrl+="?repositoryId="+encodeURIComponent(selectedRepo);
+ }
- $.ajax(metadataUrl, {
- type: "GET",
- dataType: 'json',
- success: function(data) {
- self.projectVersionMetadata=mapProjectVersionMetadata(data);
- ko.applyBindings(self,mainContent.find("#browse_artifact_detail" ).get(0));
- mainContent.find("#artifact-details-tabs").on('show', function (e) {
- if ($(e.target).attr("href")=="#artifact-details-dependency-tree-content") {
- $.log("#artifact-details-dependency-tree-content");
- }
- if ($(e.target).attr("href")=="#artifact-details-used-by-content") {
- $.log("#artifact-details-used-by-content");
- }
+ $.ajax(metadataUrl, {
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+ self.projectVersionMetadata=mapProjectVersionMetadata(data);
+ ko.applyBindings(self,mainContent.find("#browse_artifact_detail" ).get(0));
+ ko.applyBindings(self,mainContent.find("#browse_breadcrumb" ).get(0));
+ mainContent.find("#browse-autocomplete" ).hide();
+ mainContent.find("#browse-autocomplete-divider" ).hide();
+ mainContent.find("#artifact-details-tabs").on('show', function (e) {
+ if ($(e.target).attr("href")=="#artifact-details-dependency-tree-content") {
+ $.log("#artifact-details-dependency-tree-content");
+ }
+ if ($(e.target).attr("href")=="#artifact-details-used-by-content") {
+ $.log("#artifact-details-used-by-content");
+ }
- });
- }
- });
+ });
+ }
+ });
+ });
});
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1302699&r1=1302698&r2=1302699&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Mon Mar 19 22:46:44 2012
@@ -73,7 +73,11 @@
{{if i==(number-1)}}
${breadCrumbEntry.displayValue}
{{else}}
- <a href="#" data-bind="click: function(){displayGroupId(breadCrumbEntry.groupId)}">${breadCrumbEntry.displayValue}</a>
+ {{if breadCrumbEntry.artifact}}
+ <a href="#" data-bind="click: function(){displayArtifactDetail(breadCrumbEntry.groupId,breadCrumbEntry.artifactId,null,null)}">${breadCrumbEntry.displayValue}</a>
+ {{else}}
+ <a href="#" data-bind="click: function(){displayGroupId(breadCrumbEntry.groupId)}">${breadCrumbEntry.displayValue}</a>
+ {{/if}}
{{/if}}
{{if i<(number-1)}}
<span class="divider">/</span>
@@ -82,7 +86,7 @@
{{/each}}
<li>
{{if number>0}}
- <span class="divider">/</span>
+ <span class="divider" id="browse-autocomplete-divider">/</span>
{{/if}}
<input type="text" class="form-search span4" size="50" id="browse-autocomplete"/>
</li>