# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1416955763 -7200
# Node ID a385ac651d221b0b42d5d66d0fee5caaf2c5ce5c
# Parent  cb281b64cd828c3dab48ff6f259af7f8acc00350
Cleanups.

diff -r cb281b64cd82 -r a385ac651d22 ajax.js
--- a/ajax.js	Wed Nov 26 00:48:58 2014 +0200
+++ b/ajax.js	Wed Nov 26 00:49:23 2014 +0200
@@ -225,24 +225,33 @@
 }
 
 
-function jsFileUploadSelected(id, maxSize)
+function jsStartFileUpload(formID, formTarget, fileSelID, fileMaxSize, fileCallback)
 {
-}
 
+  if (formFile.size > fileMaxSize)
+  {
+    jsMessageBox("File size exceeds "+ jsFormatSize(maxSize) +".");
+    return;
+  }
 
-function jsStartFileUpload(id, tgt)
-{
-  var elem = document.getElementById(id);
-  //var fd = document.getElementById(id).getFormData(); // for FF3
-  var fd = new FormData(elem); 
+  var formElem = document.getElementById(formID);
+  if (!formElem)
+  {
+    jsMessageBox("File upload form '"+ formID +"' element not found!");
+    return;
+  }
 
+  var formData = new FormData(formElem);
   var req = jsCreateXMLRequest();
   req.upload.addEventListener('progress', jsUploadProgress, false);
-  req.addEventListener('load', jsUploadFinished, false);
+  req.addEventListener('load', function(e)
+    {
+    }, false);
+
   req.addEventListener('error', jsUploadError, false);
   req.addEventListener('abort', jsUploadAbort, false);
-  req.open('POST', tgt);
-  req.send(fd);
+  req.open('POST', formTarget);
+  req.send(formData);
 }
 
 
@@ -259,12 +268,6 @@
 }
 
 
-function jsUploadFinished(e)
-{
-  jsMessageBox(e.target.responseText);
-}
-
-
 function jsUploadError(e)
 {
   jsMessageBox("Error occured while uploading.");
@@ -273,5 +276,5 @@
 
 function jsUploadAbort(e)
 {
-  jsMessageBox("File upload aborted.");
+  jsStatusMsg("File upload aborted.");
 }