Author: olamy
Date: Tue Jan 14 05:27:18 2014
New Revision: 1557935
URL: http://svn.apache.org/r1557935
Log:
fix issue with typeahead
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java?rev=1557935&r1=1557934&r2=1557935&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
Tue Jan 14 05:27:18 2014
@@ -261,6 +261,7 @@ public class MavenRepositorySearch
try
{
FlatSearchRequest request = new FlatSearchRequest( q );
+
request.setContexts( getIndexingContexts( indexingContextIds ) );
FlatSearchResponse response = indexer.searchFlat( request );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html?rev=1557935&r1=1557934&r2=1557935&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html
Tue Jan 14 05:27:18 2014
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js?rev=1557935&r1=1557934&r2=1557935&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js
Tue Jan 14 05:27:18 2014
@@ -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",
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js?rev=1557935&r1=1557934&r2=1557935&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
Tue Jan 14 05:27:18 2014
@@ -883,7 +883,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
name: 'quick-search-result',
remote:
'restServices/archivaServices/searchService/quickSearch?queryString=%QUERY',
valueKey: 'artifactId',
- maxParallelRequests:1,
+ maxParallelRequests:0,
limit: 50
}
);
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html?rev=1557935&r1=1557934&r2=1557935&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html
Tue Jan 14 05:27:18 2014
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html?rev=1557935&r1=1557934&r2=1557935&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html
Tue Jan 14 05:27:18 2014
@@ -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>
