summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorRaghu Nayyar <hey@raghunayyar.com>2016-09-01 12:14:48 +0200
committerRaghu Nayyar <hey@raghunayyar.com>2016-09-17 14:38:26 +0200
commitb30908ba5d2d2425b32bfc3cc4db081f10de1e17 (patch)
tree37689fac97d690a256b1e5d95b21ccef467d707b /settings
parent16711a2f99ecb83aa937533bcf49d19d86a4ef03 (diff)
downloadnextcloud-server-b30908ba5d2d2425b32bfc3cc4db081f10de1e17.tar.gz
nextcloud-server-b30908ba5d2d2425b32bfc3cc4db081f10de1e17.zip
Removes tipsy when password verification is going on
Diffstat (limited to 'settings')
-rw-r--r--settings/js/personal.js2
-rw-r--r--settings/templates/personal.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js
index e2bfcbe3ad2..49bd0d68238 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -221,12 +221,14 @@ $(document).ready(function () {
$('#passworderror').hide();
$("#passwordbutton").attr('disabled', 'disabled');
$("#passwordbutton").after("<span class='password-loading icon icon-loading-small-dark password-state'></span>");
+ $(".personal-show-label").hide();
// Ajax foo
$.post(OC.generateUrl('/settings/personal/changepassword'), post, function (data) {
if (data.status === "success") {
$(".password-loading").remove();
$("#passwordbutton").after("<span class='checkmark icon icon-checkmark password-state'></span>");
removeloader();
+ $(".personal-show-label").show();
$('#pass1').val('');
$('#pass2').val('').change();
OC.msg.finishedSaving('#password-error-msg', data);
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index bbb47f48bab..b7bb0c8bfc7 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -129,7 +129,7 @@ if($_['passwordChangeSupported']) {
placeholder="<?php echo $l->t('New password');?>"
data-typetoggle="#personal-show"
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');?>" />
<br/>
</form>