diff options
| author | friendica <info@friendica.com> | 2014-02-19 12:01:34 +1100 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-19 12:01:34 +1100 |
| commit | 2e305742faf5aefa59f944bf7f011feb93ba497a (patch) | |
| tree | 341b4a1138e64fc8706109d1e5f14531f1b32907 | |
| parent | 5747e20e502cd4504aef4371b30631265579e81c (diff) | |
| parent | aa44d3abab07205a747874b244e71181e4e7a1b0 (diff) | |
| download | volse-hubzilla-2e305742faf5aefa59f944bf7f011feb93ba497a.tar.gz volse-hubzilla-2e305742faf5aefa59f944bf7f011feb93ba497a.tar.bz2 volse-hubzilla-2e305742faf5aefa59f944bf7f011feb93ba497a.zip | |
Merge pull request #320 from dawnbreak/master
Let user cancel the red_encrypt dialogue
| -rw-r--r-- | view/js/crypto.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/view/js/crypto.js b/view/js/crypto.js index 2e6402c62..c3a37d177 100644 --- a/view/js/crypto.js +++ b/view/js/crypto.js @@ -1,5 +1,4 @@ - function str_rot13 (str) { // http://kevin.vanzonneveld.net // + original by: Jonas Raoni Soares Silva (http://www.jsfromhell.com) @@ -43,7 +42,11 @@ function red_encrypt(alg, elem,text) { // key and hint need to be localised - var enc_key = bin2hex(prompt(aStr['passphrase'])); + var passphrase = prompt(aStr['passphrase']); + // let the user cancel this dialogue + if (passphrase == null) + return false; + var enc_key = bin2hex(passphrase); // If you don't provide a key you get rot13, which doesn't need a key // but consequently isn't secure. |