From: Olivier Lamy <olamy@apache.org>
Date: Thu, 23 Aug 2012 14:22:34 +0000 (+0000)
Subject: ensure jquery ui is correctly loaded
X-Git-Tag: archiva-1.4-M3~377
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b1fee5688aba752c2b5fb148f6e364423de9a1f3;p=archiva.git

ensure jquery ui is correctly loaded

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
index 66c2e6d1c..8a63149d4 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
@@ -51,7 +51,7 @@ $.ajax({
                 urlArgs: ""+appendJsNoCacheUrl(),
                 shim: {
                       'sammy':['jquery','jquery.tmpl'],
-                      'archiva.main':['jquery','sammy','jquery.tmpl'],
+                      'archiva.main':['jquery','jquery.ui','sammy','jquery.tmpl'],
                       'utils':['jquery','jquery.tmpl'],
                       'archiva.templates': ['jquery','jquery.tmpl','utils'],
                       'redback.templates': ['jquery','jquery.tmpl','utils']
@@ -97,7 +97,7 @@ $.ajax({
                 }
             });
 
-            requirejs(['jquery','jquery.tmpl','i18n','sammy','startup','utils','domReady!'], function (domReady) {
+            requirejs(['jquery','jquery.tmpl','jquery.ui','i18n','sammy','startup','utils','domReady!'], function (domReady) {
                 loadi18n(function () {
                   $.ajax({
                       url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
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 93299d01b..5d45986b9 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
@@ -20,7 +20,7 @@ define("archiva.main",["jquery","sammy","jquery.tmpl","jquery.ui","jquery.cookie
          "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() {
+function($,sammy,tmpl,ui) {
 
   /**
    * reccord a cookie for session with the logged user