From: Olivier Lamy <olamy@apache.org>
Date: Wed, 22 Aug 2012 15:12:35 +0000 (+0000)
Subject: fix auto complete with jquery 1.8
X-Git-Tag: archiva-1.4-M3~388
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=73f867c4003c3ef411489cefde01bb85f05e2f55;p=archiva.git

fix auto complete with jquery 1.8

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1376094 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
index 44a741e93..4764863f3 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-define("archiva.templates",["text!templates/archiva/menu.html",
+define("archiva.templates",["jquery.tmpl","utils","text!templates/archiva/menu.html",
           "text!templates/archiva/generics.html",
           "text!templates/archiva/modal.html",
           "text!templates/archiva/repositories.html",
           "text!templates/archiva/search.html",
-          "text!templates/archiva/general-admin.html",
-          "jquery.tmpl","utils"],
-  function(menu,generics,modal,repositories,
+          "text!templates/archiva/general-admin.html"],
+  function(jqueryTmpl,utils,menu,generics,modal,repositories,
            search,general_admin) {
 
     var htmlFragment=$("#html-fragments");
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js
index 8af4596e9..9f83a72f1 100755
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js
@@ -6466,7 +6466,8 @@ $.widget( "ui.autocomplete", {
 			})
 			.zIndex( this.element.zIndex() + 1 )
 			// workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781
-			.css({ top: 0, left: 0 })
+      // modified for top
+			.css({ top: $(this.element).offset().top+$(this.element ).height(), left: 0 })
 			.hide()
 			.data( "menu" );
 		if ( $.fn.bgiframe ) {
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
index 6e20cb492..a177bc16c 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-define("redback.templates",["text!templates/redback/user-edit.html",
-          "text!templates/redback/login.html",
-          "jquery.tmpl","utils"],
-    function(useredit, login) {
+define("redback.templates",["jquery.tmpl","utils","text!templates/redback/user-edit.html",
+          "text!templates/redback/login.html"],
+    function(jqueryTmpl,utils,useredit, login) {
 
       var htmlFragment=$("#html-fragments");
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
index 767b449c4..eec0b635e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
@@ -88,7 +88,7 @@
       {{if number>0}}
         <span class="divider" id="browse-autocomplete-divider">/</span>
       {{/if}}
-        <input type="text" class="search-query input-large" size="50" id="browse-autocomplete"/>
+        <input type="text" class="input-large" size="50" id="browse-autocomplete"/>
     </li>
   </ul>