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/02/17 23:50:40 UTC
svn commit: r1245789 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
search.js templates/search.html
Author: olamy
Date: Fri Feb 17 22:50:39 2012
New Revision: 1245789
URL: http://svn.apache.org/viewvc?rev=1245789&view=rev
Log:
simply breadcrumb calculation
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=1245789&r1=1245788&r2=1245789&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 Feb 17 22:50:39 2012
@@ -43,15 +43,21 @@ $(function() {
}
breadCrumbEntries=function(){
- var curBrowseViewModel=self;
- var entries=[];
- do{
- entries.push(curBrowseViewModel.groupId);
- curBrowseViewModel=curBrowseViewModel.parentBrowseViewModel;
- if (!curBrowseViewModel) return entries.reverse();
- }while(curBrowseViewModel.parentBrowseViewModel)
- return entries.reverse();
+ // root level ?
+ if (!self.parentBrowseViewModel) return [];
+
+ var splitted = self.groupId.split(".");
+ var breadCrumbEntries=[];
+ var curGroupId;
+ for (var i=0;i<splitted.length;i++){
+ curGroupId+=splitted[i];
+ breadCrumbEntries.push(new BreadCrumbEntry(curGroupId,splitted[i]));
+ curGroupId+="."
+ }
+ return breadCrumbEntries;
}
+
+
}
findParentGroupId=function(browseViewModel){
@@ -122,6 +128,11 @@ $(function() {
this.project=project;
}
+ BreadCrumbEntry=function(groupId,displayValue){
+ this.groupId=groupId;
+ this.displayValue=displayValue;
+ }
+
//-----------------------------------------
// search part
//-----------------------------------------
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=1245789&r1=1245788&r2=1245789&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 Fri Feb 17 22:50:39 2012
@@ -61,7 +61,9 @@
<ul class="breadcrumb">
<li><a href="#" data-bind="click: function(){ browseRoot()}"><i class="icon-home"/> </a> <span class="divider">/</span></li>
{{each(i,breadCrumbEntry) breadCrumbEntries}}
- <li><a href="#">${breadCrumbEntry}</a> <span class="divider">/</span></li>
+ <li data-bind="click: function(){displayGroupId(breadCrumbEntry.groupId)}">
+ <a href="#">${breadCrumbEntry.displayValue}</a> <span class="divider">/</span>
+ </li>
{{/each}}
</ul>
</script>
\ No newline at end of file