* Close frame on ESC keypress

5 files changed, 52 insertions, 10 deletions

diff --git a/skins/stone/global.js b/skins/stone/global.js
index d54874f..fecb217 100644
--- a/skins/stone/global.js
+++ b/skins/stone/global.js
@@ -38,6 +38,20 @@ function popupwindow(url,width,height,reloadonclose){
         parent_url = "";
 }
 
+var lastKeypress = null;
+function popupkeypress(e) {
+  var KeyID = (window.event) ? event.keyCode : e.keyCode;
+  if(KeyID == 27) { //ESC
+    closeit();
+  } 
+}
+
+function initcloseit(){
+    lastKeypress = parent.document.onkeypress;
+    parent.document.onkeypress = popupkeypress;
+    document.onkeypress = popupkeypress;
+}
+
 function closeit(){
     parent.document.getElementById("hilfsframe").style.display = "none";
     parent.document.getElementById("cframe").src="about:blank";
@@ -47,9 +61,16 @@ function closeit(){
         url += "&random=" + (Math.random() * Date.parse(new Date()));
       parent.window.location.href = url;
     }
+
+    if(lastKeypress) {
+      parent.document.onkeypress = lastKeypress;
+      lastKeypress = null;
+    }
 }
 
 
+
+
 // Request senden, aber Ergebnis nicht anzeigen, Reload der aktuellen Seite
 function toggle(cmd,data) {
 
diff --git a/skins/stone/quest.js b/skins/stone/quest.js
index cf66570..62e2c53 100644
--- a/skins/stone/quest.js
+++ b/skins/stone/quest.js
@@ -93,7 +93,7 @@ function questclose(doit) {
     questfn = null;
   }
   document.onkeypress = lastKeypress;
-  lastKeypress = null
+  lastKeypress = null;
   ttp_enable(1);
 }
 
diff --git a/skins/stone/shutter.inc b/skins/stone/shutter.inc
index 0f77338..7164446 100644
--- a/skins/stone/shutter.inc
+++ b/skins/stone/shutter.inc
@@ -1,16 +1,12 @@
 <?% IF global.bodyinc.defined && global.bodyinc == 1 && ! global.shutter.defined; global.shutter = 1 %?>
 <script type="text/javascript">
 <!--
-function popupkeypress(e) {
-    var KeyID = (window.event) ? event.keyCode : e.keyCode;
-    if(KeyID == 27) {    closeit();  } //ESC
-}
-document.onkeypress = popupkeypress;
-//-->
+  initcloseit();
+-->
 </script>
     <div id="shutter">
         <a href="javascript:closeit()">
-            <img src="images/close.gif" alt="" />
+            <img src="images/close.gif" alt="X" />
         </a>
     </div>
 <?% END %?>
diff --git a/skins/stone_flat/global.js b/skins/stone_flat/global.js
index f101bb7..ad297e9 100644
--- a/skins/stone_flat/global.js
+++ b/skins/stone_flat/global.js
@@ -38,6 +38,21 @@ function popupwindow(url,width,height,reloadonclose){
         parent_url = "";
 }
 
+var lastKeypress = null;
+function popupkeypress(e) {
+  var KeyID = (window.event) ? event.keyCode : e.keyCode;
+  if(KeyID == 27) { //ESC
+    parent.parent_url = null;
+    closeit();
+  } 
+}
+
+function initcloseit(){
+    lastKeypress = parent.document.onkeypress;
+    parent.document.onkeypress = popupkeypress;
+    document.onkeypress = popupkeypress;
+}
+
 function closeit(){
     parent.document.getElementById("hilfsframe").style.display = "none";
     parent.document.getElementById("cframe").src="about:blank";
@@ -47,6 +62,11 @@ function closeit(){
         url += "&random=" + (Math.random() * Date.parse(new Date()));
       parent.window.location.href = url;
     }
+
+    if(lastKeypress) {
+      parent.document.onkeypress = lastKeypress;
+      lastKeypress = null;
+    }
 }
 
 
diff --git a/skins/stone_flat/shutter.inc b/skins/stone_flat/shutter.inc
index e8af4ec..7164446 100644
--- a/skins/stone_flat/shutter.inc
+++ b/skins/stone_flat/shutter.inc
@@ -1,7 +1,12 @@
 <?% IF global.bodyinc.defined && global.bodyinc == 1 && ! global.shutter.defined; global.shutter = 1 %?>
+<script type="text/javascript">
+<!--
+  initcloseit();
+-->
+</script>
     <div id="shutter">
-        <a accesskey="x" href="javascript:closeit()">
-            <img align="right" src="images/close.gif" alt="" />
+        <a href="javascript:closeit()">
+            <img src="images/close.gif" alt="X" />
         </a>
     </div>
 <?% END %?>