mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt 

remove the form, it isn't needed here
This commit is contained in:
Morris Jobke 2014-01-27 04:30:06 -08:00
parent b4d11df843 6bb27ea76b
commit d182b4f59f
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
settings/js/personal.js
View File

@ -206,6 +206,8 @@ $(document).ready(function(){
$('button:button[name="submitDecryptAll"]').click(function() {
var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true);
OC.Encryption.decryptAll(privateKeyPassword);
});
@ -214,6 +216,8 @@ $(document).ready(function(){
if (privateKeyPassword !== '' ) {
$('#decryptAll button:button[name="submitDecryptAll"]').removeAttr("disabled");
if(event.which === 13) {
$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true);
OC.Encryption.decryptAll(privateKeyPassword);
}
} else {
@ -280,13 +284,13 @@ OC.Encryption = {
$.post('ajax/decryptall.php', {password:password}, function(data) {
if (data.status === "error") {
OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
$('#decryptAll input:password[name="privateKeyPassword"]').removeAttr("disabled");
} else {
OC.Encryption.msg.finishedDecrypting('#decryptAll .msg', data);
}
}
);
});
}
}
};
OC.Encryption.msg={
startDecrypting:function(selector){

42
settings/templates/personal.php
View File

@ -148,29 +148,27 @@ if($_['passwordChangeSupported']) {
};?>
<?php if($_['enableDecryptAll']): ?>
<form id="decryptAll">
<fieldset class="personalblock">
<h2>
<?php p( $l->t( 'Encryption' ) ); ?>
</h2>
<?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?>
<p>
<input
type="password"
name="privateKeyPassword"
id="privateKeyPassword" />
<label for="privateKeyPassword"><?php p($l->t( "Log-in password" )); ?></label>
<br />
<button
type="button"
disabled
name="submitDecryptAll"><?php p($l->t( "Decrypt all Files" )); ?>
</button>
<span class="msg"></span>
</p>
<fieldset class="personalblock" id="decryptAll">
<h2>
<?php p( $l->t( 'Encryption' ) ); ?>
</h2>
<?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?>
<p>
<input
type="password"
name="privateKeyPassword"
id="privateKeyPassword" />
<label for="privateKeyPassword"><?php p($l->t( "Log-in password" )); ?></label>
<br />
</fieldset>
</form>
<button
type="button"
disabled
name="submitDecryptAll"><?php p($l->t( "Decrypt all Files" )); ?>
</button>
<span class="msg"></span>
</p>
<br />
</fieldset>
<?php endif; ?>
<fieldset class="personalblock">