Removes tipsy when password verification is going on

This commit is contained in:
Raghu Nayyar 2016-09-01 12:14:48 +02:00
parent 16711a2f99
commit b30908ba5d
3 changed files with 6 additions and 3 deletions

View File

@ -490,8 +490,9 @@ label.infield {
} }
#personal-show + label { #personal-show + label {
height: 14px; height: 14px;
margin-top: 14px; margin-top: -25px;
margin-left: -36px; left: 295px;
display: block;
} }
#passwordbutton { #passwordbutton {
margin-left: .5em; margin-left: .5em;

View File

@ -221,12 +221,14 @@ $(document).ready(function () {
$('#passworderror').hide(); $('#passworderror').hide();
$("#passwordbutton").attr('disabled', 'disabled'); $("#passwordbutton").attr('disabled', 'disabled');
$("#passwordbutton").after("<span class='password-loading icon icon-loading-small-dark password-state'></span>"); $("#passwordbutton").after("<span class='password-loading icon icon-loading-small-dark password-state'></span>");
$(".personal-show-label").hide();
// Ajax foo // Ajax foo
$.post(OC.generateUrl('/settings/personal/changepassword'), post, function (data) { $.post(OC.generateUrl('/settings/personal/changepassword'), post, function (data) {
if (data.status === "success") { if (data.status === "success") {
$(".password-loading").remove(); $(".password-loading").remove();
$("#passwordbutton").after("<span class='checkmark icon icon-checkmark password-state'></span>"); $("#passwordbutton").after("<span class='checkmark icon icon-checkmark password-state'></span>");
removeloader(); removeloader();
$(".personal-show-label").show();
$('#pass1').val(''); $('#pass1').val('');
$('#pass2').val('').change(); $('#pass2').val('').change();
OC.msg.finishedSaving('#password-error-msg', data); OC.msg.finishedSaving('#password-error-msg', data);

View File

@ -129,7 +129,7 @@ if($_['passwordChangeSupported']) {
placeholder="<?php echo $l->t('New password');?>" placeholder="<?php echo $l->t('New password');?>"
data-typetoggle="#personal-show" data-typetoggle="#personal-show"
autocomplete="off" autocapitalize="off" autocorrect="off" /> autocomplete="off" autocapitalize="off" autocorrect="off" />
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label> <input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="personal-show-label"></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" /> <input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
<br/> <br/>
</form> </form>