aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-09-13 22:10:27 +0000
committerOlivier Lamy <olamy@apache.org>2012-09-13 22:10:27 +0000
commit0638fbf4b1a7bf85289ca1ad1c330ae0c7e4afe1 (patch)
treec2e1cb9e09e8a229a1a9f4ee3b300b2e253408d8
parent280635dad9cf6bc2607450a4237debd9214b1f5b (diff)
downloadarchiva-0638fbf4b1a7bf85289ca1ad1c330ae0c7e4afe1.tar.gz
archiva-0638fbf4b1a7bf85289ca1ad1c330ae0c7e4afe1.zip
call hash entry point #search
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384561 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js7
1 files changed, 3 insertions, 4 deletions
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 74840a944..974141242 100644
--- 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
@@ -283,8 +283,7 @@ function(jquery,ui,sammy,tmpl) {
//searchRequest.selectedRepoIds=repos;
searchViewModel.searchRequest(searchRequest);
displaySearch(function(){
-
- searchViewModel.search("restServices/archivaServices/searchService/searchArtifacts",repos);//,repositoryIds);
+ searchViewModel.search("restServices/archivaServices/searchService/searchArtifacts",repos);
},searchViewModel);
};
@@ -585,7 +584,7 @@ function(jquery,ui,sammy,tmpl) {
}
});
});
- //this.get('', function () { this.app.runRoute('get', '#search') });
+ this.get('#welcome', function () { this.app.runRoute('get', '#search') });
});
};
@@ -652,7 +651,7 @@ function(jquery,ui,sammy,tmpl) {
$.log("location:"+window.sammyArchivaApplication.getLocation()+",hash:"+hash);
// by default display search screen
if(!hash){
- window.sammyArchivaApplication.setLocation("#search");
+ window.sammyArchivaApplication.setLocation("#welcome");
}
};