Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-04-17 19:04:02 +0300
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-20 21:50:08 +0300
commit3bc5c1c3cf285baa4d0ceabaa09c49f85c1ae4f8 (patch)
treea0cbb73ffd5d844240886b99b38e3b22ae38bfbe
parentb78e76a1cb68ffb374044851e9f96a0c7f463862 (diff)
use a simple function - OC.Encryption is already defined - fixes #15707
This reverts commit 0ca6398aa34e0a3698f3aed0305f0e9299578bbc.
-rw-r--r--apps/encryption/js/encryption.js36
1 files changed, 13 insertions, 23 deletions
diff --git a/apps/encryption/js/encryption.js b/apps/encryption/js/encryption.js
index c02b4d74ae8..94203d93f7f 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();
});
});