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:40:32 UTC
svn commit: r1239816 [2/2] - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp:
css/bootstrap.css css/bootstrap.min.2.0.0.css index.html
js/archiva/utils.js js/redback/user.js
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=1239816&r1=1239815&r2=1239816&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:40:31 2012
@@ -312,15 +312,16 @@ $(function() {
* open a modal box for login
*/
loginBox=function(){
- $.log("loginBox");
+
screenChange();
if (window.modalLoginWindow==null) {
- window.modalLoginWindow = $("#modal-login").modal({backdrop:'static',show:false});
+ $.log("window.modalLoginWindow==null");
+ window.modalLoginWindow = $("#modal-login").modal();
window.modalLoginWindow.bind('hidden', function () {
$("#modal-login-err-message").hide();
})
}
- window.modalLoginWindow.modal('show');
+
$("#user-login-form").validate({
showErrors: function(validator, errorMap, errorList) {
customShowError(validator,errorMap,errorMap);
@@ -331,6 +332,9 @@ $(function() {
$.log("loginBox before login");
login();
});
+ $("#modal-login").show();
+ window.modalLoginWindow.modal('show');
+ $.log("window.modalLoginWindow= modal show");
$("#modal-login").focus();
}