changeset 876:a397d2be6d53

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 26 Nov 2014 16:03:54 +0200
parents 920e33605102
children 5c5bd09d15f3
files ajax.js
diffstat 1 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ajax.js	Wed Nov 26 15:59:29 2014 +0200
+++ b/ajax.js	Wed Nov 26 16:03:54 2014 +0200
@@ -3,7 +3,8 @@
 // Common JavaScript / AJAX code
 // (C) Copyright 2012-2014 Tecnic Software productions (TNSP)
 //
-var jsMessageBoxCancelCB = null, jsMessageBoxCBData = null, jsMessageBoxOKCB = null;
+var jsMessageBoxCBCancel = null, jsMessageBoxCBData = null, jsMessageBoxCBOK = null;
+
 
 function jsHandleMessageBoxKeys(ev)
 {
@@ -11,7 +12,7 @@
   var key = ev.keyCode ? ev.keyCode : ev.which;
   if (key == 27)
   {
-    jsCloseMessageBox(jsMessageBoxCancelCB, jsMessageBoxCBData);
+    jsCloseMessageBox(jsMessageBoxCBCancel, jsMessageBoxCBData);
     return false;
   }
   else
@@ -19,15 +20,21 @@
 }
 
 
+function jsSetMessageBoxCBs(cb_ok, cb_cancel, cb_data)
+{
+  jsMessageBoxCBOK = cb_ok;
+  jsMessageBoxCBCancel = cb_cancel;
+  jsMessageBoxCBData = cb_data;
+}
+
+
 function jsCloseMessageBox(callback, cb_data)
 {
   var nitem = document.getElementById("messageBox");
   if (nitem)
   {
     document.onkeydown = null;
-    jsMessageBoxCancelCB = null;
-    jsMessageBoxCBData = null;
-    jsMessageBoxOKCB = null;
+    jsSetMessageBoxCBs(null, null, null);
 
     if (nitem.style.display != "none")
     {
@@ -51,9 +58,7 @@
       "</div></div>";
 
     document.onkeydown = jsHandleMessageBoxKeys;
-    jsMessageBoxCancelCB = null;
-    jsMessageBoxCBData = null;
-    jsMessageBoxOKCB = null;
+    jsSetMessageBoxCBs(null, null, null);
 
     var elem = document.getElementById("msgBoxConfirmClose");
     elem.onclick = function () { jsCloseMessageBox(0, 0); }
@@ -87,9 +92,7 @@
       "</div></div>";
 
     document.onkeydown = jsHandleMessageBoxKeys;
-    jsMessageBoxOKCB = cb_ok;
-    jsMessageBoxCancelCB = cb_cancel;
-    jsMessageBoxCBData = cb_data;
+    jsSetMessageBoxCBs(cb_ok, cb_cancel, cb_data);
 
     var elem = document.getElementById("msgBoxConfirmCancel");
     elem.onclick = function () { jsCloseMessageBox(cb_cancel, cb_data); }