From c1a60a23498abe6502d207b8c803255e31515577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 17 Apr 2015 17:57:17 +0200
Subject: [PATCH] use a simple function - OC.Encryption is already defined -
fixes #15707
---
apps/encryption/js/encryption.js | 36 ++++++++++++--------------------
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/apps/encryption/js/encryption.js b/apps/encryption/js/encryption.js
index c02b4d74ae..94203d93f7 100644
--- a/apps/encryption/js/encryption.js
+++ b/apps/encryption/js/encryption.js
@@ -5,37 +5,27 @@
* See the COPYING-README file.
*/
-/**
- * @namespace
- * @memberOf OC
- */
-OC.Encryption= {
- MIGRATION_OPEN: 0,
- MIGRATION_COMPLETED: 1,
- MIGRATION_IN_PROGRESS: -1,
+function displayEncryptionWarning () {
- displayEncryptionWarning: function () {
-
- if (!OC.Notification.isHidden()) {
- return;
- }
+ if (!OC.Notification.isHidden()) {
+ return;
+ }
- $.get(
- OC.generateUrl('/apps/encryption/ajax/getStatus')
- , function( result ) {
- if (result.status === "success") {
- OC.Notification.show(result.data.message);
- }
+ $.get(
+ OC.generateUrl('/apps/encryption/ajax/getStatus'),
+ function( result ) {
+ if (result.status === "success") {
+ OC.Notification.show(result.data.message);
}
- );
- }
-};
+ }
+ );
+}
$(document).ready(function() {
// wait for other apps/extensions to register their event handlers and file actions
// in the "ready" clause
_.defer(function() {
- OC.Encryption.displayEncryptionWarning();
+ displayEncryptionWarning();
});
});
--
GitLab