diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-08-18 09:51:48 -0700 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-08-18 09:51:48 -0700 |
| commit | 9be836814cb4165ea54a086a0f97526d783bcd37 (patch) | |
| tree | ad57d30194571edcf0f51cd83178b8ac2f03c0aa /apps/files/js/files.js | |
| parent | c620c5840ab8ca45531c7639e086bafbd87d7365 (diff) | |
| parent | d544a371bfb84f36a3b789d19d44d6694de21c48 (diff) | |
| download | nextcloud-server-9be836814cb4165ea54a086a0f97526d783bcd37.tar.gz nextcloud-server-9be836814cb4165ea54a086a0f97526d783bcd37.zip | |
Merge pull request #4239 from owncloud/decrypt_files_again
Enable user to decrypt files again after encryption app was disabled
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index e1c53184dd1..4eb949c2eef 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -81,9 +81,23 @@ Files={ if (usedSpacePercent > 90) { OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent})); } + }, + + displayEncryptionWarning: function() { + + if (!OC.Notification.isHidden()) { + return; + } + + var encryptedFiles = $('#encryptedFiles').val(); + if (encryptedFiles === '1') { + OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.')); + return; + } } }; $(document).ready(function() { + Files.displayEncryptionWarning(); Files.bindKeyboardShortcuts(document, jQuery); $('#fileList tr').each(function(){ //little hack to set unescape filenames in attribute |