From ce3fd4802c55a5b433f5de6957525b92a5dc987b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 16 Dec 2013 01:26:06 +0000 Subject: [PATCH] force jqueryui loaded first git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1551095 13f79535-47bb-0310-9956-ffa450edef68 --- .../webapp/js/archiva/admin/features/generaladmin/main.js | 6 +++--- .../admin/repository/maven2/proxy-connectors-rules.js | 4 ++-- .../js/archiva/admin/repository/maven2/repository-groups.js | 4 ++-- .../archiva-webapp/src/main/webapp/js/archiva/search.js | 6 +++--- .../archiva-webapp/src/main/webapp/js/redback/users.js | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js index 4784224b4..b0c9208e4 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -define("archiva/admin/features/generaladmin/main",["jquery","i18n","utils","jquery.tmpl","knockout","knockout.simpleGrid", - "knockout.sortable","jquery.ui","jquery.validate","bootstrap","select2","knockout.select2"] - , function(jquery,i18n,utils,jqueryTmpl,ko,simpleGrid,sortable,jqueryUi,validate,bootstrap,select2) { +define("archiva/admin/features/generaladmin/main",["jquery","jquery.ui","i18n","utils","jquery.tmpl","knockout","knockout.simpleGrid", + "knockout.sortable","jquery.validate","bootstrap","select2","knockout.select2"] + , function(jquery,jqueryUi,i18n,utils,jqueryTmpl,ko,simpleGrid,sortable,validate,bootstrap,select2) { showMenu = function( administrationMenuItems) { administrationMenuItems.push({ text : $.i18n.prop('menu.repository-scanning') , order:2000, id: "menu-repository-scanning-list-a" , href: "#scanningList" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoryScanning();}}); diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/proxy-connectors-rules.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/proxy-connectors-rules.js index 4f55ec153..ee5d6faec 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/proxy-connectors-rules.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/proxy-connectors-rules.js @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -define("archiva/admin/repository/maven2/proxy-connectors-rules",["jquery","i18n","jquery.tmpl","bootstrap","jquery.ui","knockout" +define("archiva/admin/repository/maven2/proxy-connectors-rules",["jquery","jquery.ui","i18n","jquery.tmpl","bootstrap","knockout" ,"knockout.simpleGrid","knockout.sortable","archiva/admin/repository/maven2/proxy-connectors"], - function(jquery,i18n,jqueryTmpl,bootstrap,jqueryUi,ko) { + function(jquery,jqueryUi,i18n,jqueryTmpl,bootstrap,ko) { ProxyConnectorRulesViewModel=function(proxyConnectorRules,proxyConnectors){ var self=this; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js index f1ad1fc82..f323c26ff 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -define("archiva/admin/repository/maven2/repository-groups",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","jquery.ui","knockout" +define("archiva/admin/repository/maven2/repository-groups",["jquery","jquery.ui","i18n","jquery.tmpl","bootstrap","jquery.validate","knockout" ,"knockout.simpleGrid","knockout.sortable","archiva/admin/repository/maven2/repositories"], -function(jquery,i18n,jqueryTmpl,bootstrap,jqueryValidate,jqueryUi,ko) { +function(jquery,jqueryUi,i18n,jqueryTmpl,bootstrap,jqueryValidate,ko) { RepositoryGroup=function(id,repositories,mergedIndexPath,mergedIndexTtl){ diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js index da01206d9..a4f89fec8 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -define("archiva.search",["jquery","i18n","jquery.tmpl","select2","knockout","knockout.simpleGrid","jqueryFileTree" - ,"prettify", "d3","jquery.ui", "typeahead"] -, function(jquery,i18n,jqueryTmpl,select2,ko,koSimpleGrid,jqueryFileTree,prettify,d3,jqueryui,typeahead) { +define("archiva.search",["jquery","jquery.ui","i18n","jquery.tmpl","select2","knockout","knockout.simpleGrid","jqueryFileTree" + ,"prettify", "d3", "typeahead"] +, function(jquery,jqueryui,i18n,jqueryTmpl,select2,ko,koSimpleGrid,jqueryFileTree,prettify,d3,typeahead) { //----------------------------------------- // browse part diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js index 52268a4a9..cdc2a3611 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js @@ -16,8 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -define("redback.users",["jquery","utils","i18n","jquery.validate","knockout","knockout.simpleGrid","jquery.ui","typeahead"], -function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,jqueryui,typeahead) { +define("redback.users",["jquery","jquery.ui","utils","i18n","jquery.validate","knockout","knockout.simpleGrid","typeahead"], +function(jquery,jqueryui,utils,i18n,jqueryValidate,ko,koSimpleGrid,typeahead) { /** * view model used for users grid -- 2.39.5