# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1510058414 -7200
# Node ID 0b87e7c1675c5545afd2d3d2586f04bb929a9ff0
# Parent  fd84c6a8c4c9f630ef811709bbf69c1b826f2dfa
Improve the JavaScript event hook functions.

diff -r fd84c6a8c4c9 -r 0b87e7c1675c mgallery.js
--- a/mgallery.js	Wed Sep 06 18:21:17 2017 +0300
+++ b/mgallery.js	Tue Nov 07 14:40:14 2017 +0200
@@ -6,19 +6,28 @@
 //
 
 
-function mgalAddEvent(evobj, evtype, evcallback)
+function mgalAddEventOb(obname, evobj, evtype, evcallback)
 {
   if (evobj == null || typeof(evobj) == 'undefined')
+  {
+    console.log("Event object '"+ obname +"' == null.");
     return;
+  }
 
   if (evobj.addEventListener)
     evobj.addEventListener(evtype, evcallback, false);
   else
   if (evobj.attachEvent)
-    evobj.attachEvent("on" + evtype, evcallback);
+    evobj.attachEvent("on"+evtype, evcallback);
   else
     evobj["on"+evtype] = evcallback;
-};
+}
+
+
+function mgalAddEvent(obname, evtype, evcallback)
+{
+  mgalAddEventOb(obname, document.getElementById(obname), evtype, evcallback);
+}
 
 
 function mgalNavigateTo(url)
diff -r fd84c6a8c4c9 -r 0b87e7c1675c mgallery.php
--- a/mgallery.php	Wed Sep 06 18:21:17 2017 +0300
+++ b/mgallery.php	Tue Nov 07 14:40:14 2017 +0200
@@ -614,12 +614,13 @@
       "\n";
 ?>
 mgalDisplayInfo(false);
-mgalAddEvent(document.getElementById("pageInfoButton"), "click", mgalOpenInfo);
-mgalAddEvent(document.getElementById("imageCBox"), "click", mgalCloseInfo);
+mgalAddEvent("pageInfoButton", "click", mgalOpenInfo);
+mgalAddEvent("imageCBox", "click", mgalCloseInfo);
 
-mgalAddEvent(document.getElementById("imageImage"), "load", mgalAdjustImageDo);
-mgalAddEvent(window, "resize", mgalAdjustImage);
-mgalAddEvent(document, "keypress", mgalProcessKeyPress);
+mgalAddEvent("imageImage", "load", mgalAdjustImageDo);
+mgalAddEventOb("window", window, "resize", mgalAdjustImage);
+mgalAddEventOb("document", document, "keypress", mgalProcessKeyPress);
+
 adjustPID = -1;
 </script>
 <?