Author: olamy
Date: Thu Aug 23 21:20:46 2012
New Revision: 1376703
URL: http://svn.apache.org/viewvc?rev=1376703&view=rev
Log:
separate loading of automcomplete to prevent full failure in case of issue
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js?rev=1376703&r1=1376702&r2=1376703&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
Thu Aug 23 21:20:46 2012
@@ -97,7 +97,7 @@ $.ajax({
}
});
-
requirejs(['jquery','jquery.tmpl','jquery.ui','i18n','sammy','startup','utils','domReady!'],
function (domReady) {
+
requirejs(['jquery','jquery.tmpl','jquery.ui','i18n','sammy','startup','utils',"archiva.main",'domReady!'],
function (domReady) {
loadi18n(function () {
$.ajax({
url:
"restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
@@ -110,6 +110,7 @@ $.ajax({
require(['sammy','jquery','jquery.tmpl','archiva.main','utils','domReady!'],function
(domReady) {
startArchivaApplication();
$("#loadingDiv").hide();
+ drawQuickSearchAutocomplete();
})
}
})
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=1376703&r1=1376702&r2=1376703&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
Thu Aug 23 21:20:46 2012
@@ -20,7 +20,7 @@ define("archiva.main",["jquery","jquery.
"jquery.validate","jquery.json","knockout","redback.templates","archiva.templates",
"redback.roles","redback","archiva.general-admin","archiva.repositories",
"archiva.network-proxies","archiva.proxy-connectors","archiva.repository-groups","archiva.artifacts-management"],
-function($,sammy,tmpl,ui) {
+function(jquery,ui,sammy,tmpl) {
/**
* reccord a cookie for session with the logged user
@@ -601,6 +601,10 @@ function($,sammy,tmpl,ui) {
window.sammyArchivaApplication.run();
+ }
+
+ drawQuickSearchAutocomplete=function(){
+
$( "#quick-search-autocomplete" ).autocomplete({
minLength: 3,
delay: 600,
