diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 15:08:09 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-27 15:08:09 +0100 |
| commit | 9fb71af98850ad6638c4238ae0938972a9f23b50 (patch) | |
| tree | 52e081bc8577f78505ea80fc7158eb9235c7ed59 /settings/js/personal.js | |
| parent | 6443e570c2793954309f9541cd6a7a8c309644ac (diff) | |
| parent | 5b7b0536346a4a6608e0b294b6784ac5ff3b142a (diff) | |
| download | nextcloud-server-9fb71af98850ad6638c4238ae0938972a9f23b50.tar.gz nextcloud-server-9fb71af98850ad6638c4238ae0938972a9f23b50.zip | |
Merge branch 'master' into encryption_enable_public_upload
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
Diffstat (limited to 'settings/js/personal.js')
| -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'); } |