changeset 1078:08900352f420

Some cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 24 Jan 2017 23:22:02 +0200
parents 659d41090592
children ff0fb5e87a2f
files admajax.js.php genajax.js
diffstat 2 files changed, 35 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/admajax.js.php	Tue Jan 24 18:01:13 2017 +0200
+++ b/admajax.js.php	Tue Jan 24 23:22:02 2017 +0200
@@ -85,10 +85,9 @@
   for (var id in registeredTabs[tabset])
   {
     var thead = registeredTabs[tabset][id];
-    tabs += "<a id=\"tabHead"+ tabset + id +
-      "\" href=\"#\" onClick=\"jsSwitchActiveTab('"+tabset+"', '"+id+
-      "')\">"+ thead +"</a> ";
-    
+    var qid = "tabHead" + tabset + id;
+
+    tabs += "<a id=\""+ qid + "\" href=\"#\">"+ thead +"</a> ";
     content += "<div id=\"tabCont"+ tabset + id +"\"></div>";
   }
 
@@ -98,6 +97,14 @@
 
   item = document.getElementById("tabContents"+ tabset);
   if (item) item.innerHTML = content;
+
+  for (var id in registeredTabs[tabset])
+  {
+    var velem = document.getElementById("tabHead" + tabset + id);
+    velem.vid = id;
+    velem.vtabset = tabset;
+    velem.addEventListener('click', function (ev) { jsSwitchActiveTab(ev.target.vtabset, ev.target.vid); });
+  }
 }
 
 
--- a/genajax.js	Tue Jan 24 18:01:13 2017 +0200
+++ b/genajax.js	Tue Jan 24 23:22:02 2017 +0200
@@ -7,6 +7,24 @@
 var jsUploadCBS = [];
 
 
+function jsAddEventListener(velem, vev, vfunc)
+{
+  if (velem)
+  {
+    if (velem.attachEvent)
+       return velem.attachEvent('on'+ vev, vfunc);
+     else
+       return velem.addEventListener(vev, vfunc, false);
+  }
+}
+
+
+function jsAddEventListenerById(velem, vev, vfunc)
+{
+  jsAddEventListener(document.getElementById(velem), vev, vfunc);
+}
+
+
 function jsHandleMessageBoxKeys(ev)
 {
   ev = ev || window.event;
@@ -61,8 +79,7 @@
     document.onkeydown = jsHandleMessageBoxKeys;
     jsSetMessageBoxCBs(null, null, null);
 
-    var elem = document.getElementById("msgBoxConfirmClose");
-    elem.onclick = function () { jsCloseMessageBox(0, 0); }
+    jsAddEventListenerById("msgBoxConfirmClose", "click", function () { jsCloseMessageBox(0, 0); });
 
     nitem.style.display = "block";
   }
@@ -95,12 +112,9 @@
     document.onkeydown = jsHandleMessageBoxKeys;
     jsSetMessageBoxCBs(cb_ok, cb_cancel, cb_data);
 
-    var elem = document.getElementById("msgBoxConfirmCancel");
-    elem.onclick = function () { jsCloseMessageBox(cb_cancel, cb_data); }
+    jsAddEventListenerById("msgBoxConfirmCancel", "click", function () { jsCloseMessageBox(cb_cancel, cb_data); });
+    jsAddEventListenerById("msgBoxConfirmOK", "click", function () { jsCloseMessageBox(cb_ok, cb_data); });
 
-    elem = document.getElementById("msgBoxConfirmOK");
-    elem.onclick = function () { jsCloseMessageBox(cb_ok, cb_data); }
-    
     nitem.style.display = "block";
   }
 }
@@ -253,11 +267,9 @@
       "<img src='"+file+"' alt='"+file+"' />"+
       "</div>";
 
-    var elem = document.getElementById("messageBox");
-    elem.onclick = function () { jsCloseMessageBox(0, 0); }
+    jsAddEventListenerById("messageBox", "click", function () { jsCloseMessageBox(0, 0); });
 
     nitem.style.display = "block";
-
     return false;
   }
 
@@ -309,10 +321,12 @@
         jsStatusMsg("Upload ["+filename+"] finished ...");
     }
   }, false);
+
   req.addEventListener("error", function(e)
   {
     jsErrorMessageBox("Error occured while uploading "+filename);
   }, false);
+
   req.addEventListener("abort", function(e)
   {
     jsStatusMsg("Upload of '"+filename+"' aborted.");