summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-11-20 12:23:10 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-11-20 12:23:10 +0100
commitcaf486d6e78ee9a69d9350bce45cb9c3871df408 (patch)
tree3f089333b49ee7649ece982ca00b498f6998066c /settings
parent8bc339413ba2221fea9447f91ae093f3f1cf2ab4 (diff)
downloadnextcloud-server-caf486d6e78ee9a69d9350bce45cb9c3871df408.tar.gz
nextcloud-server-caf486d6e78ee9a69d9350bce45cb9c3871df408.zip
- show a spinner while decrypting files if the encryption app was disabled
- don't fade-out the decryption result
Diffstat (limited to 'settings')
-rw-r--r--settings/js/personal.js10
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');
}