Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issue with typeahead 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1557935 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2014-01-14 05:27:18 +00:00
parent 7b2440ca48
commit cf0be71e5f
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
View File

@ -261,6 +261,7 @@ public class MavenRepositorySearch
try
{
FlatSearchRequest request = new FlatSearchRequest( q );
request.setContexts( getIndexingContexts( indexingContextIds ) );
FlatSearchResponse response = indexer.searchFlat( request );

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html
View File

@ -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>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
View File

@ -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",

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
View File

@ -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
}
);

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html
View File

@ -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>

4
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
View File

@ -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>