[Pkg-owncloud-commits] [owncloud] 39/165: use a simple function - OC.Encryption is already defined - fixes #15707

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit c1a60a23498abe6502d207b8c803255e31515577
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Apr 17 17:57:17 2015 +0200

    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 c02b4d7..94203d9 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();
 	});
 });

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git