- show a spinner while decrypting files if the encryption app was disabled

- don't fade-out the decryption result

diff --git a/settings/js/personal.js b/settings/js/personal.js
index cdf7d0e9631010c59361611c0fa9d6d2c5ba3317..2934677f256b9cafe92d8bb3fa70eaad745bf381 100644 (file)
--- 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');
                }