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/07/10 20:55:06 UTC
svn commit: r1359837 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
main.js search.js
Author: olamy
Date: Tue Jul 10 18:55:06 2012
New Revision: 1359837
URL: http://svn.apache.org/viewvc?rev=1359837&view=rev
Log:
handle browsing via sammy so history works
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1359837&r1=1359836&r2=1359837&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Tue Jul 10 18:55:06 2012
@@ -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();
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=1359837&r1=1359836&r2=1359837&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 Jul 10 18:55:06 2012
@@ -29,7 +29,7 @@ define("archiva.search",["jquery","i18n"
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);