Merge pull request #18106 from owncloud/enc-jsnamespaceconflict

Fix namespace conflict in OC.Encryption JS code

2 files changed, 4 insertions, 12 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
diff --git a/apps/encryption/js/settings-personal.js b/apps/encryption/js/settings-personal.js
index fa94bea6bc5..75ebab5059c 100644
--- a/apps/encryption/js/settings-personal.js
+++ b/apps/encryption/js/settings-personal.js
@@ -4,11 +4,7 @@
  * See the COPYING-README file.
  */
 
-if (!OC.Encryption) {
-	OC.Encryption = {};
-}
-
-OC.Encryption = {
+OC.Encryption = _.extend(OC.Encryption || {}, {
 	updatePrivateKeyPassword: function () {
 		var oldPrivateKeyPassword = $('input:password[id="oldPrivateKeyPassword"]').val();
 		var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
@@ -26,7 +22,7 @@ OC.Encryption = {
 				OC.msg.finishedError('#ocDefaultEncryptionModule .msg', JSON.parse(jqXHR.responseText).message);
 			});
 	}
-};
+});
 
 $(document).ready(function () {