Author: olamy
Date: Wed Aug 22 15:12:35 2012
New Revision: 1376094
URL: http://svn.apache.org/viewvc?rev=1376094&view=rev
Log:
fix auto complete with jquery 1.8
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js?rev=1376094&r1=1376093&r2=1376094&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
Wed Aug 22 15:12:35 2012
@@ -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");
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js?rev=1376094&r1=1376093&r2=1376094&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.8.16.custom.min.js
Wed Aug 22 15:12:35 2012
@@ -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 ) {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js?rev=1376094&r1=1376093&r2=1376094&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
Wed Aug 22 15:12:35 2012
@@ -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");
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html?rev=1376094&r1=1376093&r2=1376094&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Wed Aug 22 15:12:35 2012
@@ -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>
