diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-11-25 02:12:31 -0800 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-11-25 02:12:31 -0800 |
| commit | de2b4440301badf48e638ede84f64692f2a2db41 (patch) | |
| tree | dc7ea1ff4b703409bb4af08caeaf7d7bd8525c5c /settings | |
| parent | 15f7315231593a002f8b7245bcd535493a30dcae (diff) | |
| parent | caf486d6e78ee9a69d9350bce45cb9c3871df408 (diff) | |
| download | nextcloud-server-de2b4440301badf48e638ede84f64692f2a2db41.tar.gz nextcloud-server-de2b4440301badf48e638ede84f64692f2a2db41.zip | |
Merge pull request #5960 from owncloud/enc_small_visual_improvements
[encryption] some small visual improvements
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/personal.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js index cdf7d0e9631..2934677f256 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -190,7 +190,7 @@ $(document).ready(function(){ var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val(); OC.Encryption.decryptAll(privateKeyPassword); }); - + $('#decryptAll input:password[name="privateKeyPassword"]').keyup(function(event) { var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val(); if (privateKeyPassword !== '' ) { @@ -202,7 +202,7 @@ $(document).ready(function(){ $('#decryptAll button:button[name="submitDecryptAll"]').attr("disabled", "true"); } }); - + var uploadparms = { done: function(e, data) { avatarResponseHandler(data.result); @@ -261,8 +261,9 @@ OC.Encryption = { OC.Encryption.msg={ startDecrypting:function(selector){ + var spinner = '<img src="'+ OC.imagePath('core', 'loading-small.gif') +'">'; $(selector) - .html( t('files_encryption', 'Decrypting files... Please wait, this can take some time.') ) + .html( t('files_encryption', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner ) .removeClass('success') .removeClass('error') .stop(true, true) @@ -273,8 +274,7 @@ OC.Encryption.msg={ $(selector).html( data.data.message ) .addClass('success') .stop(true, true) - .delay(3000) - .fadeOut(900); + .delay(3000); }else{ $(selector).html( data.data.message ).addClass('error'); } |