From 1ccf363fa8b5f69670aa4648d5bfce724e03853e Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 7 Aug 2012 18:12:52 +0000 Subject: [PATCH] add a sammy route for quick search git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1370411 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/main.js | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 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 5fa7a88ed..01cf81717 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 @@ -178,6 +178,17 @@ function() { this.activeMenuId = ko.observable(); window.sammyArchivaApplication = Sammy(function () { + this.get('#quicksearch~:artifactId',function(){ + var artifactId= this.params.artifactId; + // user can be in a non search view so init the search view first + var searchViewModel = new SearchViewModel(); + var searchRequest = new SearchRequest(); + searchRequest.artifactId(artifactId); + searchViewModel.searchRequest(searchRequest); + displaySearch(function(){ + searchViewModel.externalAdvancedSearch(); + },searchViewModel); + }); this.get('#open-admin-create-box',function(){ $.log("#open-admin-create-box"); adminCreateBox(); @@ -354,14 +365,7 @@ function() { }, select: function( event, ui ) { $.log("select artifactId:"+ui.item.artifactId); - // user can be in a non search view so init the search view first - var searchViewModel = new SearchViewModel(); - var searchRequest = new SearchRequest(); - searchRequest.artifactId(ui.item.artifactId); - searchViewModel.searchRequest(searchRequest); - displaySearch(function(){ - searchViewModel.externalAdvancedSearch(); - },searchViewModel); + window.sammyArchivaApplication.setLocation("#quicksearch~"+ui.item.artifactId); } }).data( "autocomplete" )._renderItem = function( ul, item ) { return $( "
  • " ) -- 2.39.5