handle browsing via sammy so history works

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1359837 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index 3a859668017ed5ce69f7545c7cc530c81819e7b5..1d4bb9d8e379dbb8e45a6f99f06cb5728f33d077 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -65,12 +65,6 @@ function() {
       return;
     }
 
-    var browse = $.urlParam('browse');
-    if (browse){
-      displayBrowseGroupId(browse);
-      return;
-    }
-
     var artifact= $.urlParam("artifact");
     var repositoryId = $.urlParam("repositoryId");
     // format groupId:artifactId org.apache.maven.plugins:maven-jar-plugin
@@ -262,15 +256,23 @@ function() {
       this.activeMenuId = ko.observable();
           
       window.sammyArchivaApplication = Sammy(function () {
+                this.get('#browse/:groupId',function(context){
+                  var groupId = this.params['groupId'];
+                  if (groupId){
+                    displayBrowseGroupId(groupId);
+                  } else {
+                    displayBrowse(true);
+                  }
+                });
                 this.get('#:folder', function () {
                     self.activeMenuId(this.params.folder);
                     ko.utils.arrayFirst(self.artifactMenuItems.concat(self.usersMenuItems, self.administrationMenuItems), function(p) {
                         if ( p.href == "#"+self.activeMenuId()) {
-                           p.func();
+                          p.func();
                         }
                     });
                     
-                  });
+                });
                 this.get('', function () { this.app.runRoute('get', '#Search') });
           } );
       sammyArchivaApplication.run();

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index ca50e040d462ac4880e1f6ce7921c13c1c6d55e7..bbc4ba4e0eb09f0e10c2194d987331f85ead1905 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -29,7 +29,7 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
     this.parentBrowseViewModel=parentBrowseViewModel;
     this.groupId=groupId;
     displayGroupId=function(groupId){
-      displayGroupDetail(groupId,self);
+      window.sammyArchivaApplication.setLocation("#browse/"+groupId);
     }
     displayParentGroupId=function(){
       $.log("called displayParentGroupId groupId:"+self.parentBrowseViewModel.groupId);