wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
- don't fade-out the decryption result
This commit is contained in:
Bjoern Schiessle 2013-11-20 12:23:10 +01:00
parent 8bc339413b
commit caf486d6e7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
settings/js/personal.js
View file

@ -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');
}