You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/26 17:58:14 UTC
svn commit: r1293869 [1/2] - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-webapp-js/src/main/webapp/css/
archiva-webapp-js/src/main/webapp/js/ archiva-webapp-j...
Author: olamy
Date: Sun Feb 26 16:58:13 2012
New Revision: 1293869
URL: http://svn.apache.org/viewvc?rev=1293869&view=rev
Log:
hack jqueryui to have autocomplete working with bootstrap
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery-ui-1.8.16.custom.css (contents, props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery.ui.1.8.16.ie.css (contents, props changed)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java?rev=1293869&r1=1293868&r2=1293869&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java Sun Feb 26 16:58:13 2012
@@ -61,7 +61,6 @@ public class DefaultSearchService
implements SearchService
{
-
@Inject
private RepositorySearch repositorySearch;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css?rev=1293869&r1=1293868&r2=1293869&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css Sun Feb 26 16:58:13 2012
@@ -85,4 +85,15 @@
.force-upper-case{
text-transform: uppercase;
+}
+
+.dropdown-menu {
+ max-width: 920px;
+}
+.ui-menu-item {
+ cursor: pointer;
+}
+
+.ui-autocomplete-loading{
+ background:url('../images/small-spinner.gif') no-repeat right center;
}
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery-ui-1.8.16.custom.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery-ui-1.8.16.custom.css?rev=1293869&r1=1293868&r2=1293869&view=diff
==============================================================================
(empty)
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery-ui-1.8.16.custom.css
------------------------------------------------------------------------------
svn:executable = *
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery.ui.1.8.16.ie.css
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery.ui.1.8.16.ie.css?rev=1293869&r1=1293868&r2=1293869&view=diff
==============================================================================
(empty)
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery.ui.1.8.16.ie.css
------------------------------------------------------------------------------
svn:executable = *
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1293869&r1=1293868&r2=1293869&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Sun Feb 26 16:58:13 2012
@@ -187,16 +187,18 @@ $(function() {
})
$( "#quick-search-autocomplete" ).autocomplete({
+ minLength: 3,
+ source: function(request, response){
+ $.get("restServices/archivaServices/searchService/quickSearch?queryString="+encodeURIComponent(request.term),
+ function(data) {
+ var res = $.map(data.artifact,function(item){
+ return item.artifactId;
+ });
+ response(res);
+ }
+ );
- minLength: 3,
- source: function( request, response ) {
- $.log("source");
- return ["foo","bar"];
- /*var data = $.getJSON( "restServices/archivaServices/searchService/quickSearch?queryString="+encodeURIComponent(request.term));
- return $.map(data,function(item){
- return item.artifactId;
- })*/
- }
+ }
});
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html?rev=1293869&r1=1293868&r2=1293869&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html Sun Feb 26 16:58:13 2012
@@ -48,9 +48,9 @@
</a>
</li>
<li class="pull-right">
- <form class="form-search pull-right" action="">
- <input type="text" class="ui-widget" id="quick-search-autocomplete" placeholder="Search" />
- </form>
+ <div class="ui-widget">
+ <input type="text" class="ui-autocomplete-input" id="quick-search-autocomplete" placeholder="Search" />
+ </div>
</li>
</ul>