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/02/02 21:42:50 UTC
svn commit: r1239828 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/network-proxies.js archiva/repositories.js archiva/utils.js
redback/register.js redback/user.js redback/users.js
Author: olamy
Date: Thu Feb 2 20:42:50 2012
New Revision: 1239828
URL: http://svn.apache.org/viewvc?rev=1239828&view=rev
Log:
makes more sense to use a real selector here
Modified:
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/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.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/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/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=1239828&r1=1239827&r2=1239828&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 Thu Feb 2 20:42:50 2012
@@ -256,7 +256,7 @@ $(function() {
}
}},
showErrors: function(validator, errorMap, errorList) {
- customShowError(validator,errorMap,errorMap);
+ customShowError("#main-content #network-proxy-edit-form",validator,errorMap,errorMap);
}
});
validator.settings.messages["id"]=$.i18n.prop("id.required.or.alreadyexists");
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=1239828&r1=1239827&r2=1239828&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 Thu Feb 2 20:42:50 2012
@@ -266,7 +266,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError(validator,errorMap,errorMap);
+ customShowError("#main-content #managed-repository-edit-form",validator,errorMap,errorMap);
}
});
validator.settings.messages["cronExpression"]=$.i18n.prop("cronExpression.notvalid");
@@ -693,7 +693,7 @@ $(function() {
}
},*/
showErrors: function(validator, errorMap, errorList) {
- customShowError(validator,errorMap,errorMap);
+ customShowError("#main-content #remote-repository-edit-form",validator,errorMap,errorMap);
}
});
validator.settings.messages["cronExpression"]=$.i18n.prop("cronExpression.notvalid");
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1239828&r1=1239827&r2=1239828&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js Thu Feb 2 20:42:50 2012
@@ -285,13 +285,14 @@ displayRestError=function(data,idToAppen
/**
* used by validation error to customize error display in the ui
+ * @param selector
* @param validator
* @param errorMap
* @param errorList
*/
-customShowError=function(formId, validator, errorMap, errorList) {
- $( "#"+formId+" div.control-group" ).removeClass( "error" );
- $( "#"+formId+" span.help-inline" ).remove();
+customShowError=function(selector, validator, errorMap, errorList) {
+ $( selector+" div.control-group" ).removeClass( "error" );
+ $( selector+" span.help-inline" ).remove();
for ( var i = 0; errorList[i]; i++ ) {
var error = errorList[i];
var field = $("#"+error.element.id);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js?rev=1239828&r1=1239827&r2=1239828&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js Thu Feb 2 20:42:50 2012
@@ -31,7 +31,7 @@ $(function() {
window.modalRegisterWindow.modal('show');
$("#user-register-form").validate({
showErrors: function(validator, errorMap, errorList) {
- customShowError("user-register-form",validator,errorMap,errorMap);
+ customShowError("#user-register-form",validator,errorMap,errorMap);
}
});
$("#modal-register").delegate("#modal-register-ok", "click keydown keypress", function(e) {
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=1239828&r1=1239827&r2=1239828&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 Thu Feb 2 20:42:50 2012
@@ -300,7 +300,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError("user-create",validator,errorMap,errorMap);
+ customShowError("#main-content #user-create",validator,errorMap,errorMap);
}
});
@@ -326,7 +326,7 @@ $(function() {
$("#user-login-form").validate({
showErrors: function(validator, errorMap, errorList) {
- customShowError("user-login-form",validator,errorMap,errorMap);
+ customShowError("#user-login-form",validator,errorMap,errorMap);
}
});
$("#modal-login").delegate("#modal-login-ok", "click keydown keypress", function(e) {
@@ -478,7 +478,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError("password-change-form",validator,errorMap,errorMap);
+ customShowError("#password-change-form",validator,errorMap,errorMap);
}
});
@@ -528,7 +528,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError("user-edit-form",validator,errorMap,errorMap);
+ customShowError("#user-edit-form",validator,errorMap,errorMap);
}
});
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=1239828&r1=1239827&r2=1239828&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 Thu Feb 2 20:42:50 2012
@@ -21,7 +21,7 @@ $(function() {
/**
* view model used for users grid
*/
- usersViewModel=function() {
+ UsersViewModel=function() {
this.users = ko.observableArray([]);
var self = this;
@@ -63,7 +63,7 @@ $(function() {
$("#main-content #user-edit").remove();
$('#main-content #user-create').show();
ko.renderTemplate("redback/user-edit-tmpl", new User(), null, $("#createUserForm").get(0),"replaceChildren");
- $("#main-content #createUserForm #user-create").delegate("#user-create-form-cancel-button", "click keydown", function(e) {
+ $("#main-content #createUserForm #user-create-form-cancel-button").on( "click", function(e) {
e.preventDefault();
activateUsersGridTab();
});
@@ -74,7 +74,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError("user-create",validator,errorMap,errorMap);
+ customShowError("#main-content #user-create",validator,errorMap,errorMap);
}
});
$("#main-content #createUserForm #user-create").delegate("#user-create-form-register-button", "click keydown", function(e) {
@@ -121,7 +121,7 @@ $(function() {
$("#main-content #users-view-tabs-li-user-edit a").html($.i18n.prop("edit"));
- $("#main-content #user-create").delegate("#user-create-form-cancel-button", "click keydown", function(e) {
+ $("#main-content #user-create #user-create-form-cancel-button").on("click", function(e) {
e.preventDefault();
activateUsersGridTab();
});
@@ -133,7 +133,7 @@ $(function() {
}
},
showErrors: function(validator, errorMap, errorList) {
- customShowError("user-create",validator,errorMap,errorMap);
+ customShowError("#main-content #user-create",validator,errorMap,errorMap);
}
});
$("#main-content #user-create").delegate("#user-create-form-save-button", "click keydown", function(e) {
@@ -213,11 +213,11 @@ $(function() {
screenChange();
$("#main-content").html(mediumSpinnerImg());
jQuery("#main-content").attr("data-bind",'template: {name:"usersGrid"}');
- window.redbackModel.usersViewModel = new usersViewModel();
+ window.redbackModel.usersViewModel = new UsersViewModel();
window.redbackModel.usersViewModel.loadUsers();
ko.applyBindings(window.redbackModel.usersViewModel,jQuery("#main-content").get(0));
$("#main-content").tab('show');//#users-view-tabs
- $("#main-content a[data-toggle='tab']").on('show', function (e) {
+ $("#main-content #users-view-tabs a[data-toggle='tab']").on('show', function (e) {
//$.log( $(e.target).attr("href") ); // activated tab
//e.relatedTarget // previous tab
if ($(e.target).attr("href")=="#createUserForm") {