aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-04-17 17:59:53 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-17 17:59:53 +0200
commita255866a937d906dbbe0ed46aa7394326b30e4f5 (patch)
tree9f9e426b9109dfd6da09bd55b104012a6984329a /apps/encryption
parentc1a60a23498abe6502d207b8c803255e31515577 (diff)
downloadnextcloud-server-a255866a937d906dbbe0ed46aa7394326b30e4f5.tar.gz
nextcloud-server-a255866a937d906dbbe0ed46aa7394326b30e4f5.zip
make jshint happy
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/js/settings-admin.js19
-rw-r--r--apps/encryption/js/settings-personal.js18
2 files changed, 20 insertions, 17 deletions
diff --git a/apps/encryption/js/settings-admin.js b/apps/encryption/js/settings-admin.js
index 36765adf3e4..bb539f6a4e2 100644
--- a/apps/encryption/js/settings-admin.js
+++ b/apps/encryption/js/settings-admin.js
@@ -12,17 +12,20 @@ $(document).ready(function(){
$( 'input:radio[name="adminEnableRecovery"]' ).change(
function() {
var recoveryStatus = $( this ).val();
- var oldStatus = (1+parseInt(recoveryStatus)) % 2;
+ var oldStatus = (1+parseInt(recoveryStatus, 10)) % 2;
var recoveryPassword = $( '#encryptionRecoveryPassword' ).val();
var confirmPassword = $( '#repeatEncryptionRecoveryPassword' ).val();
OC.msg.startSaving('#encryptionSetRecoveryKey .msg');
$.post(
- OC.generateUrl('/apps/encryption/ajax/adminRecovery')
- , { adminEnableRecovery: recoveryStatus, recoveryPassword: recoveryPassword, confirmPassword: confirmPassword }
- , function( result ) {
+ OC.generateUrl('/apps/encryption/ajax/adminRecovery'),
+ { adminEnableRecovery: recoveryStatus,
+ recoveryPassword: recoveryPassword,
+ confirmPassword: confirmPassword },
+ function( result ) {
OC.msg.finishedSaving('#encryptionSetRecoveryKey .msg', result);
if (result.status === "error") {
- $('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]').attr("checked", "true");
+ $('input:radio[name="adminEnableRecovery"][value="'+oldStatus.toString()+'"]')
+ .attr("checked", "true");
} else {
if (recoveryStatus === "0") {
$('p[name="changeRecoveryPasswordBlock"]').addClass("hidden");
@@ -44,9 +47,9 @@ $(document).ready(function(){
var confirmNewPassword = $('#repeatedNewEncryptionRecoveryPassword').val();
OC.msg.startSaving('#encryptionChangeRecoveryKey .msg');
$.post(
- OC.generateUrl('/apps/encryption/ajax/changeRecoveryPassword')
- , { oldPassword: oldRecoveryPassword, newPassword: newRecoveryPassword, confirmPassword: confirmNewPassword }
- , function( data ) {
+ OC.generateUrl('/apps/encryption/ajax/changeRecoveryPassword'),
+ { oldPassword: oldRecoveryPassword, newPassword: newRecoveryPassword, confirmPassword: confirmNewPassword },
+ function( data ) {
OC.msg.finishedSaving('#encryptionChangeRecoveryKey .msg', data);
}
);
diff --git a/apps/encryption/js/settings-personal.js b/apps/encryption/js/settings-personal.js
index dcfbba4ecde..21a7e66a96f 100644
--- a/apps/encryption/js/settings-personal.js
+++ b/apps/encryption/js/settings-personal.js
@@ -4,14 +4,14 @@
* See the COPYING-README file.
*/
-function updatePrivateKeyPasswd() {
+function updatePrivateKeyPassword() {
var oldPrivateKeyPassword = $('input:password[id="oldPrivateKeyPassword"]').val();
var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
OC.msg.startSaving('#encryption .msg');
$.post(
- OC.generateUrl('/apps/encryption/ajax/updatePrivateKeyPassword')
- , { oldPassword: oldPrivateKeyPassword, newPassword: newPrivateKeyPassword }
- , function( data ) {
+ OC.generateUrl('/apps/encryption/ajax/updatePrivateKeyPassword'),
+ { oldPassword: oldPrivateKeyPassword, newPassword: newPrivateKeyPassword },
+ function( data ) {
if (data.status === "error") {
OC.msg.finishedSaving('#encryption .msg', data);
} else {
@@ -29,9 +29,9 @@ $(document).ready(function(){
var recoveryStatus = $( this ).val();
OC.msg.startAction('#userEnableRecovery .msg', 'Updating recovery keys. This can take some time...');
$.post(
- OC.generateUrl('/apps/encryption/ajax/userSetRecovery')
- , { userEnableRecovery: recoveryStatus }
- , function( data ) {
+ OC.generateUrl('/apps/encryption/ajax/userSetRecovery'),
+ { userEnableRecovery: recoveryStatus },
+ function( data ) {
OC.msg.finishedAction('#userEnableRecovery .msg', data);
}
);
@@ -48,7 +48,7 @@ $(document).ready(function(){
if (newPrivateKeyPassword !== '' && oldPrivateKeyPassword !== '' ) {
$('button:button[name="submitChangePrivateKeyPassword"]').removeAttr("disabled");
if(event.which === 13) {
- updatePrivateKeyPasswd();
+ updatePrivateKeyPassword();
}
} else {
$('button:button[name="submitChangePrivateKeyPassword"]').attr("disabled", "true");
@@ -56,7 +56,7 @@ $(document).ready(function(){
});
$('button:button[name="submitChangePrivateKeyPassword"]').click(function() {
- updatePrivateKeyPasswd();
+ updatePrivateKeyPassword();
});
});