From 0638fbf4b1a7bf85289ca1ad1c330ae0c7e4afe1 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 13 Sep 2012 22:10:27 +0000 Subject: call hash entry point #search git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384561 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-webapp-js/src/main/webapp/js/archiva/main.js | 7 +++---- 1 file 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"); } }; -- cgit v1.2.3