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/06/12 10:56:23 UTC
svn commit: r1349198 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/utils.js redback/user.js
Author: olamy
Date: Tue Jun 12 08:56:22 2012
New Revision: 1349198
URL: http://svn.apache.org/viewvc?rev=1349198&view=rev
Log:
focus on username when opening login form
Modified:
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/user.js
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=1349198&r1=1349197&r2=1349198&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 Tue Jun 12 08:56:22 2012
@@ -309,8 +309,7 @@ define("utils",["jquery","i18n","jquery.
* @param errorList
*/
customShowError=function(selector, validator, errorMap, errorList) {
- $(selector).find("div.control-group" ).removeClass( "error" );
- $(selector).find("span.help-inline").remove();
+ removeValidationErrorMessages(selector);
for ( var i = 0; errorList[i]; i++ ) {
var error = errorList[i];
var field = $(selector).find("#"+error.element.id);
@@ -319,6 +318,11 @@ define("utils",["jquery","i18n","jquery.
}
}
+ removeValidationErrorMessages=function(selector){
+ $(selector).find("div.control-group" ).removeClass( "error" );
+ $(selector).find("span.help-inline").remove();
+ }
+
appendArchivaVersion=function(){
return "_archivaVersion="+window.archivaRuntimeInfo.version;
}
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=1349198&r1=1349197&r2=1349198&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 Tue Jun 12 08:56:22 2012
@@ -326,12 +326,19 @@ define("redback.user",["jquery","order!u
}
if (window.modalLoginWindow==null) {
window.modalLoginWindow = $("#modal-login").modal();
- window.modalLoginWindow.bind('hidden', function () {
- $("#modal-login-err-message").hide();
+ window.modalLoginWindow.on('hidden', function () {
+ $("#modal-login-err-message").html("");
+ removeValidationErrorMessages("#user-login-form");
+ });
+ // focus on user name
+ window.modalLoginWindow.on('shown', function (e) {
+ $("#user-login-form-username" ).focus();
})
}
- $("#user-login-form").validate({
+ var userLoginForm = $("#user-login-form");
+
+ userLoginForm.validate({
showErrors: function(validator, errorMap, errorList) {
customShowError("#user-login-form",validator,errorMap,errorMap);
}
@@ -347,10 +354,9 @@ define("redback.user",["jquery","order!u
passwordReset();
});
-
-
}
+
/**
* callback success function on rest login call.
* modal close and hide/show some links (login,logout,register...)