make jshint happy

This reverts commit ae681f0061f534b48b45cf9a41f6110c0ff20b1d.

diff --git a/apps/encryption/js/settings-admin.js b/apps/encryption/js/settings-admin.js
index 36765adf3e4283245d839a1c025b661e977580e7..bb539f6a4e2a419de9cf42f078ee62d00ca86333 100644 (file)
--- 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 68609877c05e2c92347766ca751e14bd646640dc..601bf22d78d3bb6a89b9de7a0e8ce9085af17e0e 100644 (file)
--- a/apps/encryption/js/settings-personal.js
+++ b/apps/encryption/js/settings-personal.js
@@ -4,7 +4,7 @@
  * 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');
@@ -26,9 +26,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);
                                }
                        );
@@ -45,7 +45,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");
@@ -53,7 +53,7 @@ $(document).ready(function(){
        });
 
        $('button:button[name="submitChangePrivateKeyPassword"]').click(function() {
-               updatePrivateKeyPasswd();
+               updatePrivateKeyPassword();
        });
 
 });