Author: olamy
Date: Sun Jul 29 19:22:07 2012
New Revision: 1366909
URL: http://svn.apache.org/viewvc?rev=1366909&view=rev
Log:
correctly handle current groupId browsing when changing repositoryId.
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/utils.js
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=1366909&r1=1366908&r2=1366909&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
Sun Jul 29 19:22:07 2012
@@ -694,7 +694,13 @@ define("archiva.search",["jquery","i18n"
changeBrowseRepository=function(){
var selectedRepository=getSelectedBrowsingRepository();
- window.sammyArchivaApplication.setLocation("#browse~"+selectedRepository);
+ // #browse~internal/org.apache.maven
+ var currentHash=window.location.hash;
+ var newLocation =
"#browse~"+selectedRepository+currentHash.substringAfterFirst("/");
+ // do we have extra path after repository ?
+
+ $.log("changeBrowseRepository:"+newLocation);
+ window.sammyArchivaApplication.setLocation(newLocation);
}
getSelectedBrowsingRepository=function(){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1366909&r1=1366908&r2=1366909&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Sun Jul 29 19:22:07 2012
@@ -405,6 +405,18 @@ define("utils",["jquery","i18n","jquery.
String.prototype.substringAfterLast = function(str) {
return this.substring(this.lastIndexOf(str)+1);
}
+ /**
+ *
+ * @param str
+ * @return {String} if str not found return empty string
+ */
+ String.prototype.substringAfterFirst = function(str) {
+ var idx = this.indexOf(str);
+ if (idx<0){
+ return "";
+ }
+ return this.substring(idx);
+ }
//-----------------------------------------
// extends jquery tmpl to support var def
