]> source.dussan.org Git - archiva.git/commitdiff
fix hash when changing repository
authorOlivier Lamy <olamy@apache.org>
Tue, 7 Aug 2012 18:13:44 +0000 (18:13 +0000)
committerOlivier Lamy <olamy@apache.org>
Tue, 7 Aug 2012 18:13:44 +0000 (18:13 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1370415 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js

index fc9f3c43dd1c767906a5931d72c86f1d9b59dd74..f48ae26f1e275df75f2ec46d38e0f8f9c4b8d66e 100644 (file)
@@ -756,8 +756,14 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
   changeBrowseRepository=function(){
     var selectedRepository=getSelectedBrowsingRepository();
     // #browse~internal/org.apache.maven
+    // or #artifact~snapshots/org.apache.maven.plugins/maven-compiler-plugin
     var currentHash=window.location.hash;
-    var newLocation = "#browse";
+
+
+
+    $.log("currentHash:"+currentHash);
+
+    var newLocation = currentHash.substringBeforeFirst("/");// "#browse";
     if (selectedRepository){
       newLocation+="~"+selectedRepository;
     }
index cbaeefd4f6a1fa1a9103bbef648e64abe3124a4a..9fb10cc86fd55cca4bd9d5d8fca3eb8c1c5f5791 100644 (file)
@@ -402,6 +402,14 @@ define("utils",["jquery","i18n","jquery.tmpl"], function() {
     return this.substring(0,this.lastIndexOf(str));
   }
 
+  String.prototype.substringBeforeFirst = function(str) {
+    var idx = this.indexOf(str);
+    if(idx<0){
+      return this;
+    }
+    return this.substring(0,idx);
+  }
+
   String.prototype.substringAfterLast = function(str) {
     return this.substring(this.lastIndexOf(str)+1);
   }