summaryrefslogtreecommitdiffstats
path: root/apps/encryption/js/encryption.js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/encryption/js/encryption.js')
-rw-r--r--apps/encryption/js/encryption.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/encryption/js/encryption.js b/apps/encryption/js/encryption.js
index a6c1bea89b2..361347b44b7 100644
--- a/apps/encryption/js/encryption.js
+++ b/apps/encryption/js/encryption.js
@@ -5,15 +5,11 @@
* See the COPYING-README file.
*/
-if (!OC.Encryption) {
- OC.Encryption = {};
-}
-
/**
* @namespace
* @memberOf OC
*/
-OC.Encryption = {
+OC.Encryption = _.extend(OC.Encryption || {}, {
displayEncryptionWarning: function () {
if (!OC.currentUser || !OC.Notification.isHidden()) {
return;
@@ -28,7 +24,7 @@ OC.Encryption = {
}
);
}
-};
+});
$(document).ready(function() {
// wait for other apps/extensions to register their event handlers and file actions
// in the "ready" clause