comparison genajax.js @ 1078:08900352f420

Some cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 24 Jan 2017 23:22:02 +0200
parents 7da8bde9b7be
children 5f48cb05bfff
comparison
equal deleted inserted replaced
1076:659d41090592 1078:08900352f420
5 // 5 //
6 var jsMessageBoxCBCancel = null, jsMessageBoxCBData = null, jsMessageBoxCBOK = null; 6 var jsMessageBoxCBCancel = null, jsMessageBoxCBData = null, jsMessageBoxCBOK = null;
7 var jsUploadCBS = []; 7 var jsUploadCBS = [];
8 8
9 9
10 function jsAddEventListener(velem, vev, vfunc)
11 {
12 if (velem)
13 {
14 if (velem.attachEvent)
15 return velem.attachEvent('on'+ vev, vfunc);
16 else
17 return velem.addEventListener(vev, vfunc, false);
18 }
19 }
20
21
22 function jsAddEventListenerById(velem, vev, vfunc)
23 {
24 jsAddEventListener(document.getElementById(velem), vev, vfunc);
25 }
26
27
10 function jsHandleMessageBoxKeys(ev) 28 function jsHandleMessageBoxKeys(ev)
11 { 29 {
12 ev = ev || window.event; 30 ev = ev || window.event;
13 var key = ev.keyCode ? ev.keyCode : ev.which; 31 var key = ev.keyCode ? ev.keyCode : ev.which;
14 if (key == 27) 32 if (key == 27)
59 "</div></div>"; 77 "</div></div>";
60 78
61 document.onkeydown = jsHandleMessageBoxKeys; 79 document.onkeydown = jsHandleMessageBoxKeys;
62 jsSetMessageBoxCBs(null, null, null); 80 jsSetMessageBoxCBs(null, null, null);
63 81
64 var elem = document.getElementById("msgBoxConfirmClose"); 82 jsAddEventListenerById("msgBoxConfirmClose", "click", function () { jsCloseMessageBox(0, 0); });
65 elem.onclick = function () { jsCloseMessageBox(0, 0); }
66 83
67 nitem.style.display = "block"; 84 nitem.style.display = "block";
68 } 85 }
69 } 86 }
70 87
93 "</div></div>"; 110 "</div></div>";
94 111
95 document.onkeydown = jsHandleMessageBoxKeys; 112 document.onkeydown = jsHandleMessageBoxKeys;
96 jsSetMessageBoxCBs(cb_ok, cb_cancel, cb_data); 113 jsSetMessageBoxCBs(cb_ok, cb_cancel, cb_data);
97 114
98 var elem = document.getElementById("msgBoxConfirmCancel"); 115 jsAddEventListenerById("msgBoxConfirmCancel", "click", function () { jsCloseMessageBox(cb_cancel, cb_data); });
99 elem.onclick = function () { jsCloseMessageBox(cb_cancel, cb_data); } 116 jsAddEventListenerById("msgBoxConfirmOK", "click", function () { jsCloseMessageBox(cb_ok, cb_data); });
100 117
101 elem = document.getElementById("msgBoxConfirmOK");
102 elem.onclick = function () { jsCloseMessageBox(cb_ok, cb_data); }
103
104 nitem.style.display = "block"; 118 nitem.style.display = "block";
105 } 119 }
106 } 120 }
107 121
108 122
251 { 265 {
252 nitem.innerHTML = "<div class='imageBoxInner'>"+ 266 nitem.innerHTML = "<div class='imageBoxInner'>"+
253 "<img src='"+file+"' alt='"+file+"' />"+ 267 "<img src='"+file+"' alt='"+file+"' />"+
254 "</div>"; 268 "</div>";
255 269
256 var elem = document.getElementById("messageBox"); 270 jsAddEventListenerById("messageBox", "click", function () { jsCloseMessageBox(0, 0); });
257 elem.onclick = function () { jsCloseMessageBox(0, 0); }
258 271
259 nitem.style.display = "block"; 272 nitem.style.display = "block";
260
261 return false; 273 return false;
262 } 274 }
263 275
264 return true; 276 return true;
265 } 277 }
307 jsStatusMsg("Uploaded ["+filename+"] "+ complete.toString() +'%, '+ jsFormatSize(e.loaded)); 319 jsStatusMsg("Uploaded ["+filename+"] "+ complete.toString() +'%, '+ jsFormatSize(e.loaded));
308 else 320 else
309 jsStatusMsg("Upload ["+filename+"] finished ..."); 321 jsStatusMsg("Upload ["+filename+"] finished ...");
310 } 322 }
311 }, false); 323 }, false);
324
312 req.addEventListener("error", function(e) 325 req.addEventListener("error", function(e)
313 { 326 {
314 jsErrorMessageBox("Error occured while uploading "+filename); 327 jsErrorMessageBox("Error occured while uploading "+filename);
315 }, false); 328 }, false);
329
316 req.addEventListener("abort", function(e) 330 req.addEventListener("abort", function(e)
317 { 331 {
318 jsStatusMsg("Upload of '"+filename+"' aborted."); 332 jsStatusMsg("Upload of '"+filename+"' aborted.");
319 }, false); 333 }, false);
320 334