From 064da9596ed5f7cf35d25918a57f83235e4245af Mon Sep 17 00:00:00 2001
From: anomen <ludek.h@gmail.com>
Date: Mon, 6 Feb 2012 23:42:42 +0100
Subject: [PATCH] www-apps/pmwiki - cookbook - aescrypt - dialog: close button
 - dialog: close by Esc key

---
 www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php | 8 +++++++-
 www-apps/pmwiki/cookbook/AesCrypt/main.js      | 5 +++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php b/www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php
index 3673450..8ff8ea0 100644
--- a/www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php
+++ b/www-apps/pmwiki/cookbook/AesCrypt/aescrypt.php
@@ -10,7 +10,7 @@
     (at your option) any later version.
 */
 
-$RecipeInfo['AesCrypt']['Version'] = '2012-02-05';
+$RecipeInfo['AesCrypt']['Version'] = '2012-02-06';
 
 SDV($AesCryptKDF, 'sha256_dup');
 SDV($AesCryptCipherToken, '(:aes ');
@@ -64,6 +64,11 @@ SDV($HTMLStylesFmt['aescrypt'], "
      padding:15px;
      text-align:center;
 }
+
+#aescrypt_i {
+    float:right;
+}
+
 ");
 
 
@@ -83,6 +88,7 @@ AesCtr.kdf = function(password, nBits, nonce) {
 AesCrypt.AesCryptCipherToken = '$AesCryptCipherToken';
 AesCrypt.AesCryptEndToken = '$AesCryptEndToken';
 AesCrypt.AesCryptPadding = $AesCryptPadding;
+AesCrypt.PubDirUrl = '$PubDirUrl/aescrypt';
 
 // ]]>
 </script>
diff --git a/www-apps/pmwiki/cookbook/AesCrypt/main.js b/www-apps/pmwiki/cookbook/AesCrypt/main.js
index f7cfd74..01d8a53 100644
--- a/www-apps/pmwiki/cookbook/AesCrypt/main.js
+++ b/www-apps/pmwiki/cookbook/AesCrypt/main.js
@@ -32,6 +32,7 @@ AesCrypt.createPopup = function ()
     if (!AesCrypt.popupDiv) {
         var popup =  '<div id=\'aescrypt_o\' class=\'aescrypt_overlay\'>' 
 	        + '<div>' 
+	        + '<img onclick=\'AesCrypt.hideDialog()\' width=\'15\' height=\'15\' alt=\'close dialog\' id=\'aescrypt_i\' src=\''+AesCrypt.PubDirUrl+'/close.png\' />'
 	        + '<p id=\'aescrypt_l\'>Enter password:</p>' 
 	        + '<form id=\'aescrypt_f\' onsubmit=\'AesCrypt.overlaySubmit();return false;\'>' 
 	        + '<input type=\'password\' name=\'aescrypt_p\' id=\'aescrypt_p\' />' 
@@ -81,7 +82,7 @@ AesCrypt.showDialog = function(label, decmode)
     pw.focus();
     pw.value = '';
         
-    AesCrypt.addEvent(window, 'keypress', AesCrypt.onEscPress);
+    AesCrypt.addEvent(window, 'keyup', AesCrypt.onEscPress);
 }
 
 /**
@@ -94,7 +95,7 @@ AesCrypt.hideDialog = function()
     document.getElementById('aescrypt_all').style.visibility = 'inherit';
     document.getElementById('aescrypt_l').childNodes[0].nodeValue = 'Enter password:';
 
-    AesCrypt.removeEvent(window, 'keypress', AesCrypt.onEscPress, false);
+    AesCrypt.removeEvent(window, 'keyup', AesCrypt.onEscPress, false);
 }
 
 
-- 
2.11.4.GIT