diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-08-23 16:19:47 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-08-23 16:19:47 +0000 |
| commit | 6506537883c3dac18d0fd93b9ffc94072ee657b0 (patch) | |
| tree | a69f043835e64feb4c92be184053efc954169176 /archiva-modules | |
| parent | 50f63a49ab394c7069466e41dd8cbd3f9d7b6a9d (diff) | |
| download | archiva-6506537883c3dac18d0fd93b9ffc94072ee657b0.tar.gz archiva-6506537883c3dac18d0fd93b9ffc94072ee657b0.zip | |
load jquery ui on start
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1376575 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html | 1 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html index e1c4efb0a..1e31f8a7a 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html @@ -32,6 +32,7 @@ <script type="text/javascript" src="js/jquery-1.8.0.min.js"></script> + <script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script> <script type="text/javascript" src="js/sammy.0.7.1.js"></script> <script type="text/javascript" data-main="js/archiva/archiva.js" src="js/require.2.0.6.js"></script> diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js index 3baa67acf..6127c28b8 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("archiva.main",["jquery","sammy","jquery.tmpl","jquery.ui","jquery.cookie","bootstrap","archiva.search", +define("archiva.main",["jquery","jquery.ui","sammy","jquery.tmpl","jquery.cookie","bootstrap","archiva.search", "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"], @@ -597,6 +597,10 @@ function($,sammy,tmpl,ui) { checkCreateAdminLink(); $('#footer-content').html($('#footer-tmpl').tmpl(window.archivaRuntimeInfo)); + updateAppearanceToolBar(); + + window.sammyArchivaApplication.run(); + $( "#quick-search-autocomplete" ).autocomplete({ minLength: 3, delay: 600, @@ -626,9 +630,6 @@ function($,sammy,tmpl,ui) { .append( "<a>" + item.artifactId + "</a>" ) .appendTo( ul ); }; - updateAppearanceToolBar(); - - window.sammyArchivaApplication.run(); } |