svn commit: r1370415 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva: search.js utils.js

[olamy]

Author: olamy
Date: Tue Aug  7 18:13:44 2012
New Revision: 1370415

URL: http://svn.apache.org/viewvc?rev=1370415&view=rev
Log:
fix hash when changing repository

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=1370415&r1=1370414&r2=1370415&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
 Tue Aug  7 18:13:44 2012
@@ -756,8 +756,14 @@ define("archiva.search",["jquery","i18n"
   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;
     }

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=1370415&r1=1370414&r2=1370415&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
 Tue Aug  7 18:13:44 2012
@@ -402,6 +402,14 @@ define("utils",["jquery","i18n","jquery.
     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);
   }