Author: olamy
Date: Thu Aug 23 14:22:34 2012
New Revision: 1376501
URL: http://svn.apache.org/viewvc?rev=1376501&view=rev
Log:
ensure jquery ui is correctly loaded
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=1376501&r1=1376500&r2=1376501&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 14:22:34 2012
@@ -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(),
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=1376501&r1=1376500&r2=1376501&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 14:22:34 2012
@@ -20,7 +20,7 @@ define("archiva.main",["jquery","sammy",
"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
