Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure jquery ui is correctly loaded 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1376501 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-08-23 14:22:34 +00:00
parent d7a08776a0
commit b1fee5688a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js
View File

@ -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(),

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
View File

@ -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