diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-21 19:20:25 +0200 |
| commit | 0ce35af02acb2fa9fe0ef401dc75345b5114e3d6 (patch) | |
| tree | 5ff19a7cc1bce5901cfeec7e11179ed2682b9e78 /apps/files/js/files.js | |
| parent | 7c296a6cf915da6630422ceb8e253ebf9f004964 (diff) | |
| parent | a89199cc7bd19f6ba3e76fcd510219b2bd930ae6 (diff) | |
| download | nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.tar.gz nextcloud-server-0ce35af02acb2fa9fe0ef401dc75345b5114e3d6.zip | |
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
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 |