summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-04-21 12:01:56 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-21 12:01:56 +0200
commit4a2f8f81ca8dcc91c5b784077620517ec1011724 (patch)
tree5b6f5623b1d9da14b94e2d860bf1dbd63791bc49 /settings/js
parent55962c5f5ad0e03618a0a3c1267d72c8f607e2dd (diff)
downloadnextcloud-server-4a2f8f81ca8dcc91c5b784077620517ec1011724.tar.gz
nextcloud-server-4a2f8f81ca8dcc91c5b784077620517ec1011724.zip
Don't pollute the global namespace
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/personal.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 165b55bcdae..f3fcf614bfa 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -330,8 +330,9 @@ $(document).ready(function () {
$('#sslCertificate tbody').append(row);
},
- fail: function (e, data) {
- OC.Notification.showTemporary(t('settings', 'An error occured. Please upload an ASCII-encoded PEM certificate.'));
+ fail: function () {
+ OC.Notification.showTemporary(
+ t('settings', 'An error occurred. Please upload an ASCII-encoded PEM certificate.'));
}
});
@@ -340,8 +341,9 @@ $(document).ready(function () {
});
});
-OC.Encryption = {
-};
+if (!OC.Encryption) {
+ OC.Encryption = {};
+}
OC.Encryption.msg = {
start: function (selector, msg) {