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/03/27 00:50:16 UTC
svn commit: r1305650 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
./ js/archiva/ js/redback/
Author: olamy
Date: Mon Mar 26 22:50:15 2012
New Revision: 1305650
URL: http://svn.apache.org/viewvc?rev=1305650&view=rev
Log:
cleanup small js files.
defined a js files as a module for require js.
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/operation.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/permission.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/resource.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/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.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/redback/redback-tmpl.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
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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -64,7 +64,18 @@
"jquery_json": "jquery.json-2.3.min",
"knockout.simpleGrid": "knockout.simpleGrid",
"knockout": "knockout-2.0.0.debug",
- "knockout.sortable": "knockout-sortable"
+ "knockout.sortable": "knockout-sortable",
+ "redback": "redback/redback",
+ "general-admin":"archiva/general-admin",
+ "redback-templates": "redback/redback-tmpl",
+ "main-templates": "archiva/main-tmpl",
+ "repositories": "archiva/repositories",
+ "network-proxies": "archiva/network-proxies",
+ "proxy-connectors": "archiva/proxy-connectors",
+ "repository-groups": "archiva/repository-groups",
+ "roles": "redback/roles",
+ "user": "redback/user",
+ "users": "redback/users"
}
// file upload dependencies
//.script("jquery.iframe-transport-1.4.js").wait()
@@ -72,7 +83,7 @@
//.script("jquery.fileupload-ip-1.0.6.js").wait()
//.script("jquery.fileupload-ui-6.6.3.js" ).wait()
});
- require(['domReady','jquery','i18n','startup'], function (domReady) {
+ require(['order!domReady','order!jquery','order!i18n','order!startup'], function (domReady) {
domReady.withResources(function () {
loadi18n();
$.ajax(
@@ -84,15 +95,6 @@
window.archivaJavascriptLog=data.javascriptLog;
window.archivaRuntimeInfo=data;
- require.config({
- baseUrl: "js/",
- urlArgs: "_="+new Date().getTime(),
- "paths": {
- "redback": buildLoadJsUrl("redback/redback.js")
-
- }
- });
-
// CacheBust is for dev purpose use false in prod env !
var options = {
AlwaysPreserveOrder:true,
@@ -102,20 +104,6 @@
};
$LAB.setGlobalDefaults(options);
$LAB
- .script(buildLoadJsUrl("archiva/main-tmpl.js")).wait()
- .script(buildLoadJsUrl("archiva/general-admin.js"))
- .script(buildLoadJsUrl("archiva/repositories.js")).wait()
- .script(buildLoadJsUrl("archiva/network-proxies.js")).wait()
- .script(buildLoadJsUrl("archiva/proxy-connectors.js")).wait()
- .script(buildLoadJsUrl("redback/operation.js")).wait()
- .script(buildLoadJsUrl("archiva/repository-groups.js")).wait()
- .script(buildLoadJsUrl("redback/redback-tmpl.js")).wait()
- .script(buildLoadJsUrl("redback/user.js")).wait()
- .script(buildLoadJsUrl("redback/users.js")).wait()
- .script(buildLoadJsUrl("redback/register.js")).wait()
- .script(buildLoadJsUrl("redback/permission.js")).wait()
- .script(buildLoadJsUrl("redback/resource.js")).wait()
- .script(buildLoadJsUrl("redback/roles.js")).wait()
.script(buildLoadJsUrl("archiva/main.js"));
}
})
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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("general-admin",["jquery","i18n","order!utils","order!jquery_tmpl","order!knockout","jquery_validate","bootstrap"]
+ , function() {
//-------------------------
// legacy path part
@@ -822,4 +823,5 @@ $(function() {
}
});
}
+
});
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js?rev=1305650&r1=1305649&r2=1305650&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js Mon Mar 26 22:50:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-require(["text!js/archiva/templates/menu.html"+appendTemplateUrl(),
+define("main-templates",["text!js/archiva/templates/menu.html"+appendTemplateUrl(),
"text!js/archiva/templates/message.html"+appendTemplateUrl(),
"text!js/archiva/templates/modal.html"+appendTemplateUrl(),
"text!js/archiva/templates/grids-generics.html"+appendTemplateUrl(),
@@ -25,7 +25,8 @@ require(["text!js/archiva/templates/menu
"text!js/archiva/templates/proxy-connectors.html"+appendTemplateUrl(),
"text!js/archiva/templates/repository-groups.html"+appendTemplateUrl(),
"text!js/archiva/templates/search.html"+appendTemplateUrl(),
- "text!js/archiva/templates/general-admin.html"+appendTemplateUrl()],
+ "text!js/archiva/templates/general-admin.html"+appendTemplateUrl(),
+ "jquery_tmpl","utils"],
function(menu,message,modal,grids_generics,repositories,network_proxies,proxies_connectors,
repository_groups,search,general_admin) {
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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -17,10 +17,12 @@
* under the License.
*/
require( ["order!jquery","jquery_ui","jquery_cookie","bootstrap","order!archiva/search",
- "jquery_validate","jquery_json","order!knockout","order!redback/redback"],
+ "jquery_validate","jquery_json","order!knockout","order!redback-templates","order!main-templates","order!roles",
+ "order!redback","general-admin","repositories","network-proxies","proxy-connectors","repository-groups"],
function() {
+
// define a container object with various datas
window.archivaModel = {};
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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("network-proxies",["jquery","i18n","jquery_tmpl","bootstrap","jquery_validate"], 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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("proxy-connectors",["jquery","i18n","jquery_tmpl","bootstrap","jquery_validate"], 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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("repositories",["jquery","i18n","jquery_tmpl","bootstrap","jquery_validate"], function() {
// FIXME this must be dynamic if we do a plugin mechanism with dynamic repositories types
// FIXME i18n
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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("repository-groups",["jquery","i18n","jquery_tmpl","bootstrap","jquery_validate","jquery_ui"],
+function() {
RepositoryGroup=function(id,repositories){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js?rev=1305650&r1=1305649&r2=1305650&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js Mon Mar 26 22:50:15 2012
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-require(["text!js/redback/templates/user-edit.html"+appendTemplateUrl(),
+define("redback-templates",["text!js/redback/templates/user-edit.html"+appendTemplateUrl(),
"text!js/redback/templates/user-grids.html"+appendTemplateUrl(),
"text!js/redback/templates/login.html"+appendTemplateUrl(),
"text!js/redback/templates/register-form.html"+appendTemplateUrl(),
"text!js/redback/templates/password-change-form.html"+appendTemplateUrl(),
"text!js/redback/templates/user-edit-form.html"+appendTemplateUrl(),
- "text!js/redback/templates/roles-tmpl.html"+appendTemplateUrl()],
+ "text!js/redback/templates/roles-tmpl.html"+appendTemplateUrl(),
+ "jquery_tmpl","utils"],
function(useredit, usergrids, login,register,passwordchange,usereditform,roles) {
var htmlFragment=$("#html-fragments");
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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("redback",["jquery","order!utils","jquery_validate","jquery_json","roles","user","users"], function() {
// define a container object with various datas
window.redbackModel = {userOperationNames:null,key:null,i18n:$.i18n.map};
@@ -50,4 +50,146 @@ $(function() {
});
}
+ Operation=function(name) {
+ this.name=ko.observable(name);
+ }
+
+ /**
+ * @param data Operation response from redback rest api
+ */
+ mapOperation=function(data) {
+ return new Operation(data.name,null);
+ }
+
+ Permission=function(name,operation,resource) {
+ this.name=ko.observable(name);
+ this.operation=ko.observable(operation);
+ this.resource=ko.observable(resource);
+ }
+
+ /**
+ * @param data Permission response from redback rest api
+ */
+ mapPermission=function(data) {
+ return new Permission(data.name,
+ data.operation?mapOperation(data.operation):null,
+ data.resource?mapResource(data.resource):null);
+ }
+
+ Resource=function(identifier,pattern) {
+ this.identifier=ko.observable(identifier);
+ this.pattern=ko.observable(pattern);
+ }
+
+ /**
+ * @param data Resource response from redback rest api
+ */
+ mapResource=function(data) {
+ return new Resource(data.identifier,data.pattern);
+ }
+
+ //---------------------------------------
+ // register part
+ //---------------------------------------
+
+ /**
+ * open the register modal box
+ */
+ registerBox=function(){
+ if (window.modalRegisterWindow==null) {
+ window.modalRegisterWindow = $("#modal-register").modal({backdrop:'static',show:false});
+ window.modalRegisterWindow.bind('hidden', function () {
+ $("#modal-register-err-message").hide();
+ })
+ }
+ window.modalRegisterWindow.modal('show');
+ $("#user-register-form").validate({
+ showErrors: function(validator, errorMap, errorList) {
+ customShowError("#user-register-form",validator,errorMap,errorMap);
+ }
+ });
+ $("#modal-register").delegate("#modal-register-ok", "click keydown keypress", function(e) {
+ e.preventDefault();
+ register();
+ });
+ //$("#modal-register").focus();
+ }
+
+ /**
+ * validate the register form and call REST service
+ */
+ register=function(){
+ $.log("register.js#register");
+ var valid = $("#user-register-form").valid();
+ if (!valid) {
+ return;
+ }
+ clearUserMessages();
+ $("#modal-register-ok").attr("disabled","disabled");
+
+ $('#modal-register-footer').append(smallSpinnerImg());
+
+ var user = {};
+ user.username = $("#user-register-form-username").val();
+ user.fullName = $("#user-register-form-fullname").val();
+ user.email = $("#user-register-form-email").val();
+ jQuery.ajax({
+ url: 'restServices/redbackServices/userService/registerUser',
+ data: JSON.stringify(user),
+ type: 'POST',
+ contentType: "application/json",
+ success: function(result){
+ var registered = false;
+ if (result == "-1") {
+ registered = false;
+ } else {
+ registered = true;
+ }
+
+ if (registered == true) {
+ window.modalRegisterWindow.modal('hide');
+ $("#register-link").hide();
+ // FIXME i18n
+ displaySuccessMessage("registered your key has been sent");
+ }
+ },
+ complete: function(){
+ $("#modal-register-ok").removeAttr("disabled");
+ removeSmallSpinnerImg();
+ },
+ error: function(result) {
+ var obj = jQuery.parseJSON(result.responseText);
+ displayRedbackError(obj);
+ window.modalRegisterWindow.modal('hide');
+ }
+ })
+
+ }
+
+ /**
+ * validate a registration key and go to change password key
+ * @param key
+ */
+ validateKey=function(key,registration) {
+ // FIXME spinner display
+ $.ajax({
+ url: 'restServices/redbackServices/userService/validateKey/'+key,
+ type: 'GET',
+ success: function(result){
+ window.redbackModel.key=key;
+ $.log("validateKey#sucess");
+ changePasswordBox(false,registration?registration:true,null);
+ },
+ complete: function(){
+ // hide spinner
+ },
+ error: function(result) {
+ $.log("validateKey#error");
+ var obj = jQuery.parseJSON(result.responseText);
+ $.log("validateKey#error response:"+obj);
+ displayRedbackError(obj);
+ }
+ })
+ }
+
});
\ No newline at end of file
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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("roles",["jquery","order!utils","i18n","jquery_validate","order!knockout","order!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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("user",["jquery","order!utils","i18n","jquery_validate","order!knockout","order!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=1305650&r1=1305649&r2=1305650&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 Mar 26 22:50:15 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-$(function() {
+define("users",["jquery","order!utils","i18n","jquery_validate","order!knockout","order!knockout.simpleGrid"], function() {
/**
* view model used for users grid