You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/07/09 23:29:16 UTC
svn commit: r1359411 [1/3] - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
./ js/ js/archiva/ js/redback/
Author: olamy
Date: Mon Jul 9 21:29:15 2012
New Revision: 1359411
URL: http://svn.apache.org/viewvc?rev=1359411&view=rev
Log:
ok require js 2.0.2 works fine with small changes remove of order plugin
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/require.2.0.2.js (with props)
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/require.1.0.8.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/domReady.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/text.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Mon Jul 9 21:29:15 2012
@@ -33,7 +33,7 @@
<script type="text/javascript" src="js/jquery-1.7.2.js"></script>
- <script type="text/javascript" src="js/require.1.0.8.js"></script>
+ <script type="text/javascript" src="js/require.2.0.2.js"></script>
<title>Apache Archiva</title>
@@ -137,6 +137,7 @@
"archiva.proxy-connectors": "archiva/proxy-connectors",
"archiva.repository-groups": "archiva/repository-groups",
"archiva.artifacts-management": "archiva/artifacts-management",
+ "archiva.search": "archiva/search",
"archiva.main": "archiva/main"
}
});
@@ -144,8 +145,8 @@
- require(['order!domReady','order!jquery','order!i18n','order!startup'], function (domReady) {
- domReady.withResources(
+ require(['domReady!','jquery','i18n','startup'], function (domReady) {
+ //domReady(
loadi18n(function () {
$.ajax({
url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
@@ -154,13 +155,14 @@
window.archivaDevMode=data.devMode;
window.archivaJavascriptLog=data.javascriptLog;
window.archivaRuntimeInfo=data;
+ console.log("before start app");
-
- require(['order!domReady','archiva/main'],function (domReady) {
- domReady.withResources(function () {
+ require(['domReady!','archiva.main'],function (domReady) {
+ //domReady(function () {
+ $.log("startArchivaApplication");
startArchivaApplication();
$("#loadingDiv").hide();
- })
+ //})
})
@@ -168,7 +170,7 @@
}
})
})
- );
+ //);
});
}
})
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js Mon Jul 9 21:29:15 2012
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("archiva.artifacts-management",["jquery","i18n","order!utils","order!jquery.tmpl","order!knockout",
- "order!knockout.simpleGrid","jquery.validate","bootstrap","jquery.fileupload","jquery.fileupload.ui"]
+define("archiva.artifacts-management",["jquery","i18n","utils","jquery.tmpl","knockout",
+ "knockout.simpleGrid","jquery.validate","bootstrap","jquery.fileupload","jquery.fileupload.ui"]
, function() {
ArtifactUpload=function(classifier,pomFile){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js Mon Jul 9 21:29:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("archiva.general-admin",["jquery","i18n","order!utils","order!jquery.tmpl","order!knockout","order!knockout.simpleGrid",
+define("archiva.general-admin",["jquery","i18n","utils","jquery.tmpl","knockout","knockout.simpleGrid",
"knockout.sortable","jquery.validate","bootstrap"]
, function() {
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=1359411&r1=1359410&r2=1359411&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 Mon Jul 9 21:29:15 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("archiva.main",["order!jquery","jquery.ui","jquery.cookie","bootstrap","order!archiva/search",
- "jquery.validate","jquery.json","order!knockout","order!redback.templates","order!archiva.templates",
- "order!redback.roles","order!redback","archiva.general-admin","archiva.repositories",
+define("archiva.main",["jquery","jquery.ui","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"],
function() {
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Mon Jul 9 21:29:15 2012
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("archiva.network-proxies",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","order!knockout"
- ,"order!knockout.simpleGrid"], function() {
+define("archiva.network-proxies",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","knockout"
+ ,"knockout.simpleGrid"], function() {
NetworkProxy=function(id,protocol,host,port,username,password,useNtlm){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js Mon Jul 9 21:29:15 2012
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","order!knockout"
- ,"order!knockout.simpleGrid","knockout.sortable"], function() {
+define("archiva.proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","knockout"
+ ,"knockout.simpleGrid","knockout.sortable"], function() {
ProxyConnector=function(sourceRepoId,targetRepoId,proxyId,blackListPatterns,whiteListPatterns,policiesEntries,propertiesEntries,
disabled,order){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Mon Jul 9 21:29:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("archiva.repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","order!knockout","order!knockout.simpleGrid"],
+define("archiva.repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","knockout","knockout.simpleGrid"],
function() {
// FIXME this must be dynamic if we do a plugin mechanism with dynamic repositories types
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js Mon Jul 9 21:29:15 2012
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("archiva.repository-groups",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","jquery.ui","order!knockout"
- ,"order!knockout.simpleGrid","knockout.sortable"],
+define("archiva.repository-groups",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","jquery.ui","knockout"
+ ,"knockout.simpleGrid","knockout.sortable"],
function() {
RepositoryGroup=function(id,repositories){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Mon Jul 9 21:29:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("search",["jquery","i18n","jquery.tmpl","choosen","order!knockout","knockout.simpleGrid","jqueryFileTree","prettify"]
+define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","knockout.simpleGrid","jqueryFileTree","prettify"]
, function() {
//-----------------------------------------
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/domReady.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/domReady.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/domReady.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/domReady.js Mon Jul 9 21:29:15 2012
@@ -1,35 +1,32 @@
/**
- * @license RequireJS domReady 1.0.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS domReady 2.0.0 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/requirejs for details
+ * see: http://github.com/requirejs/domReady for details
*/
-/*jslint strict: false, plusplus: false */
+/*jslint */
/*global require: false, define: false, requirejs: false,
window: false, clearInterval: false, document: false,
self: false, setInterval: false */
define(function () {
+ 'use strict';
+
var isBrowser = typeof window !== "undefined" && window.document,
isPageLoaded = !isBrowser,
doc = isBrowser ? document : null,
readyCalls = [],
- readyLoaderCalls = [],
- //Bind to a specific implementation, but if not there, try a
- //a generic one under the "require" name.
- req = requirejs || require || {},
- oldResourcesReady = req.resourcesReady,
- scrollIntervalId;
+ isTop, testDiv, scrollIntervalId;
function runCallbacks(callbacks) {
- for (var i = 0, callback; (callback = callbacks[i]); i++) {
- callback(doc);
+ var i;
+ for (i = 0; i < callbacks.length; i++) {
+ callbacks[i](doc);
}
}
function callReady() {
- var callbacks = readyCalls,
- loaderCallbacks = readyLoaderCalls;
+ var callbacks = readyCalls;
if (isPageLoaded) {
//Call the DOM ready callbacks
@@ -37,35 +34,10 @@ define(function () {
readyCalls = [];
runCallbacks(callbacks);
}
-
- //Now handle DOM ready + loader ready callbacks.
- if (req.resourcesDone && loaderCallbacks.length) {
- readyLoaderCalls = [];
- runCallbacks(loaderCallbacks);
- }
}
}
/**
- * Add a method to require to get callbacks if there are loader resources still
- * being loaded. If so, then hold off calling "withResources" callbacks.
- *
- * @param {Boolean} isReady: pass true if all resources have been loaded.
- */
- if ('resourcesReady' in req) {
- req.resourcesReady = function (isReady) {
- //Call the old function if it is around.
- if (oldResourcesReady) {
- oldResourcesReady(isReady);
- }
-
- if (isReady) {
- callReady();
- }
- };
- }
-
- /**
* Sets the page as loaded.
*/
function pageLoaded() {
@@ -88,31 +60,32 @@ define(function () {
} else if (window.attachEvent) {
window.attachEvent("onload", pageLoaded);
- //DOMContentLoaded approximation, as found by Diego Perini:
- //http://javascript.nwbox.com/IEContentLoaded/
- if (self === self.top) {
+ testDiv = document.createElement('div');
+ try {
+ isTop = window.frameElement === null;
+ } catch(e) {}
+
+ //DOMContentLoaded approximation that uses a doScroll, as found by
+ //Diego Perini: http://javascript.nwbox.com/IEContentLoaded/,
+ //but modified by other contributors, including jdalton
+ if (testDiv.doScroll && isTop && window.external) {
scrollIntervalId = setInterval(function () {
try {
- //From this ticket:
- //http://bugs.dojotoolkit.org/ticket/11106,
- //In IE HTML Application (HTA), such as in a selenium test,
- //javascript in the iframe can't see anything outside
- //of it, so self===self.top is true, but the iframe is
- //not the top window and doScroll will be available
- //before document.body is set. Test document.body
- //before trying the doScroll trick.
- if (document.body) {
- document.documentElement.doScroll("left");
- pageLoaded();
- }
+ testDiv.doScroll();
+ pageLoaded();
} catch (e) {}
}, 30);
}
}
//Check if document already complete, and if so, just trigger page load
- //listeners.
- if (document.readyState === "complete") {
+ //listeners. Latest webkit browsers also use "interactive", and
+ //will fire the onDOMContentLoaded before "interactive" but not after
+ //entering "interactive" or "complete". More details:
+ //http://dev.w3.org/html5/spec/the-end.html#the-end
+ //http://stackoverflow.com/questions/3665561/document-readystate-of-interactive-vs-ondomcontentloaded
+ if (document.readyState === "complete" ||
+ document.readyState === "interactive") {
pageLoaded();
}
}
@@ -133,25 +106,7 @@ define(function () {
return domReady;
}
- /**
- * Callback that waits for DOM ready as well as any outstanding
- * loader resources. Useful when there are implicit dependencies.
- * This method should be avoided, and always use explicit
- * dependency resolution, with just regular DOM ready callbacks.
- * The callback passed to this method will be called immediately
- * if the DOM and loader are already ready.
- * @param {Function} callback
- */
- domReady.withResources = function (callback) {
- if (isPageLoaded && req.resourcesDone) {
- callback(doc);
- } else {
- readyLoaderCalls.push(callback);
- }
- return domReady;
- };
-
- domReady.version = '1.0.0';
+ domReady.version = '2.0.0';
/**
* Loader Plugin API method
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js Mon Jul 9 21:29:15 2012
@@ -1,5 +1,5 @@
//knockout-sortable | (c) 2012 Ryan Niemeyer | http://www.opensource.org/licenses/mit-license
-define("knockout.sortable",["jquery","order!utils","order!knockout"], function() {
+define("knockout.sortable",["jquery","utils","knockout"], function() {
(function(ko, $, undefined) {
var prepareTemplateOptions = function(valueAccessor) {
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js Mon Jul 9 21:29:15 2012
@@ -10,7 +10,7 @@
// ... etc
-define("knockout.simpleGrid",["jquery","order!utils","i18n","order!knockout"], function() {
+define("knockout.simpleGrid",["jquery","utils","i18n","knockout"], function() {
(function (ko, $) {
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js Mon Jul 9 21:29:15 2012
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("redback",["jquery","order!utils","jquery.validate","jquery.json","order!knockout",
- "order!knockout.simpleGrid","redback.roles","redback.user","redback.users"], function() {
+define("redback",["jquery","utils","jquery.validate","jquery.json","knockout",
+ "knockout.simpleGrid","redback.roles","redback.user","redback.users"], function() {
// define a container object with various datas
window.redbackModel = {userOperationNames:null,key:null,i18n:$.i18n.map};
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js Mon Jul 9 21:29:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("redback.roles",["jquery","order!utils","i18n","jquery.validate","order!knockout","order!knockout.simpleGrid"], function() {
+define("redback.roles",["jquery","utils","i18n","jquery.validate","knockout","knockout.simpleGrid"], function() {
Role = function(name,description,assignable,childRoleNames,parentRoleNames,users,parentsRolesUsers,permissions,otherUsers){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js Mon Jul 9 21:29:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("redback.user",["jquery","order!utils","i18n","jquery.validate","order!knockout","order!knockout.simpleGrid"], function() {
+define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","knockout.simpleGrid"], function() {
/**
* object model for user with some function to create/update/delete users
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js?rev=1359411&r1=1359410&r2=1359411&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js Mon Jul 9 21:29:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("redback.users",["jquery","order!utils","i18n","jquery.validate","order!knockout","order!knockout.simpleGrid"], function() {
+define("redback.users",["jquery","utils","i18n","jquery.validate","knockout","knockout.simpleGrid"], function() {
/**
* view model used for users grid