diff options
author | Olivier Lamy <olamy@apache.org> | 2014-01-14 05:27:18 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2014-01-14 05:27:18 +0000 |
commit | cf0be71e5fd4e873918d0f199f36eeafc3e374e4 (patch) | |
tree | 2dba9aa5b01f60ffad30dffcb20f5d65e0c619b3 | |
parent | 7b2440ca48cd275002f43e1663aa75faf0ca57df (diff) | |
download | archiva-cf0be71e5fd4e873918d0f199f36eeafc3e374e4.tar.gz archiva-cf0be71e5fd4e873918d0f199f36eeafc3e374e4.zip |
fix issue with typeahead
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1557935 13f79535-47bb-0310-9956-ffa450edef68
6 files changed, 7 insertions, 6 deletions
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java index 554208cc3..45b5db0cc 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java @@ -261,6 +261,7 @@ public class MavenRepositorySearch try { FlatSearchRequest request = new FlatSearchRequest( q ); + request.setContexts( getIndexingContexts( indexingContextIds ) ); FlatSearchResponse response = indexer.searchFlat( request ); diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html index 9a91bd1b6..dc13280c6 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html @@ -34,7 +34,7 @@ <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script> - <script type="text/javascript" src="js/jquery-ui-1.9.2.custom.min.js"></script> + <script type="text/javascript" src="js/jquery-ui-1.10.3.custom.min.js"></script> <script type="text/javascript" src="js/sammy.0.7.4.js"></script> <script type="text/javascript" data-main="js/archiva/archiva.js" src="js/require.min.2.1.9.js"></script> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js index 79dd9e8b9..4283b2407 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js @@ -62,7 +62,7 @@ $.ajax({ "jquery.tmpl": "jquery.tmpl", "utils": "archiva/utils", "startup": "archiva/startup", - "jquery.ui": "jquery-ui-1.9.2.custom.min", + "jquery.ui": "jquery-ui-1.10.3.custom.min", "jquery.ui.widget": "jquery.ui.widget-1.9.2", "jquery.cookie": "jquery.cookie.1.0.0", "bootstrap": "bootstrap.2.2.2", diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js index 29473a3d8..c6cbbc694 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js @@ -883,7 +883,7 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa name: 'quick-search-result', remote: 'restServices/archivaServices/searchService/quickSearch?queryString=%QUERY', valueKey: 'artifactId', - maxParallelRequests:1, + maxParallelRequests:0, limit: 50 } ); diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html index 6cd30d173..118265db8 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html @@ -77,7 +77,7 @@ <h5>${$.i18n.prop('welcome.quick.search')}</h5> <span class="span2"></span> <form class="form-search"> - <input type="text" class="search-query" id="quick-search-autocomplete-welcome" + <input type="text" class="twitter-typeahead" id="quick-search-autocomplete-welcome" placeholder="${$.i18n.prop('menu.topbar.quicksearch')}"/> </form> </div> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html index f21d01143..df8c42e4a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html @@ -108,8 +108,8 @@ </a> </li> <li> - <div class="ui-widget navbar-search"> - <input type="text" class="ui-autocomplete-input search-query" id="quick-search-autocomplete" + <div class="navbar-search"> + <input type="text" class="twitter-typeahead" id="quick-search-autocomplete" placeholder="${$.i18n.prop('menu.topbar.quicksearch')}"/> </div> </li> |