[Pkg-owncloud-commits] [owncloud] 15/239: - show a spinner while decrypting files if the encryption app was disabled - don't fade-out the decryption result

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit caf486d6e78ee9a69d9350bce45cb9c3871df408
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Nov 20 12:23:10 2013 +0100

    - show a spinner while decrypting files if the encryption app was disabled
    - don't fade-out the decryption result
---
 settings/js/personal.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/settings/js/personal.js b/settings/js/personal.js
index cdf7d0e..2934677 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');
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git