seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS584

This commit is contained in:
Ubuntu 2013-09-10 06:24:11 +00:00
parent 0140ba67cb
commit 141b39eda3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/accounts_identity.js
View File

@ -80,11 +80,16 @@
function handleUpdateEmail() {
resetForm();
$('#account-edit-email-submit').addClass('button-disabled');
$('#account-edit-email-submit').bind('click', false);
$('#email-update-password-dialog *').show();
$('#email-update-password-dialog input[name=password]').focus();
}
function handleUpdateEmailPasswordPromptCancel() {
$('#account-edit-email-submit').removeClass('button-disabled');
$('#account-edit-email-submit').unbind('click', false);
$('#email-update-password-dialog *').hide();
$('#email-update-password-dialog input[name=password]').val('');
}
@ -128,6 +133,8 @@
}
function postUpdateEmailSuccess(response, email) {
$('#account-edit-email-submit').removeClass('button-disabled');
$('#account-edit-email-submit').unbind('click', false);
app.notify(
{ title: "Confirmation Email Sent",
text: "A confirmation email should arrive shortly at " + email + ". Please click the confirmation link in it to confirm your email change."
@ -136,7 +143,8 @@
}
function postUpdateEmailFailure(xhr, textStatus, errorMessage) {
$('#account-edit-email-submit').removeClass('button-disabled');
$('#account-edit-email-submit').unbind('click', false);
var errors = JSON.parse(xhr.responseText)
if(xhr.status == 422) {
@ -225,4 +233,4 @@
return this;
};
})(window,jQuery);
})(window,jQuery);

1
app/assets/stylesheets/client/screen_common.css.scss
View File

@ -218,7 +218,6 @@ small {
color:#EEE;
background-color:#666;
cursor:default;
content: "Hang on..."
}
.button-disabled:hover{