From fac035fa723d334b6d0cdbf381fa3c4789ef644c Mon Sep 17 00:00:00 2001
From: nemik <nemik@nemik.net>
Date: Sat, 23 Jul 2016 12:41:57 -0500
Subject: [PATCH] remove dependency on nanoajax

---
 html/flash.html      |  1 -
 html/flash.js        | 19 ++++++++-----------
 html/nanoajax.min.js |  2 --
 html/ui.js           |  4 ++--
 4 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 html/nanoajax.min.js

diff --git a/html/flash.html b/html/flash.html
index c06d808..2de096a 100644
--- a/html/flash.html
+++ b/html/flash.html
@@ -33,7 +33,6 @@
   </div>
 </div>
 
-<script src="nanoajax.min.js"></script>
 <script src="flash.js"></script>
 <script type="text/javascript">
 onLoad(function() {
diff --git a/html/flash.js b/html/flash.js
index 1f56ca2..ca3d6ef 100644
--- a/html/flash.js
+++ b/html/flash.js
@@ -8,18 +8,15 @@ function flashFirmware(e) {
   $("#fw-spinner").removeAttribute("hidden");
   showNotification("Firmware is being updated ...");
 
-  nanoajax.ajax({url: '/flash/upload', method: 'POST', body: fw_data}, function (code, responseText, request) {
-    if(""+code == "200")
-    {
-      ajaxReq("GET", "/flash/reboot", function (resp) {
-        showNotification("Firmware has been successfully updated!");
-        setTimeout(function(){ window.location.reload()}, 4000);
+  ajaxReq("POST", "/flash/upload", function (resp) {
+    ajaxReq("GET", "/flash/reboot", function (resp) {
+      showNotification("Firmware has been successfully updated!");
+      setTimeout(function(){ window.location.reload()}, 4000);
 
-        $("#fw-spinner").setAttribute("hidden", "");
-        $("#fw-form").removeAttribute("hidden");
-      });
-    }
-  })
+      $("#fw-spinner").setAttribute("hidden", "");
+      $("#fw-form").removeAttribute("hidden");
+    });
+  }, null, fw_data)
 }
 
 function fetchFlash() {
diff --git a/html/nanoajax.min.js b/html/nanoajax.min.js
deleted file mode 100644
index bbe0310..0000000
--- a/html/nanoajax.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// https://github.com/yanatan16/nanoajax
-!function(t,e){function n(t){return t&&e.XDomainRequest&&!/MSIE 1/.test(navigator.userAgent)?new XDomainRequest:e.XMLHttpRequest?new XMLHttpRequest:void 0}function o(t,e,n){t[e]=t[e]||n}var r=["responseType","withCredentials","timeout","onprogress"];t.ajax=function(t,a){function s(t,e){return function(){c||(a(void 0===f.status?t:f.status,0===f.status?"Error":f.response||f.responseText||e,f),c=!0)}}var u=t.headers||{},i=t.body,d=t.method||(i?"POST":"GET"),c=!1,f=n(t.cors);f.open(d,t.url,!0);var l=f.onload=s(200);f.onreadystatechange=function(){4===f.readyState&&l()},f.onerror=s(null,"Error"),f.ontimeout=s(null,"Timeout"),f.onabort=s(null,"Abort"),i&&(o(u,"X-Requested-With","XMLHttpRequest"),e.FormData&&i instanceof e.FormData||o(u,"Content-Type","application/x-www-form-urlencoded"));for(var p,m=0,v=r.length;v>m;m++)p=r[m],void 0!==t[p]&&(f[p]=t[p]);for(var p in u)f.setRequestHeader(p,u[p]);return f.send(i),f},e.nanoajax=t}({},function(){return this}());
\ No newline at end of file
diff --git a/html/ui.js b/html/ui.js
index aa66f69..67361c9 100644
--- a/html/ui.js
+++ b/html/ui.js
@@ -151,7 +151,7 @@ function toggleClass(el, cl) {
 
 //===== AJAX
 
-function ajaxReq(method, url, ok_cb, err_cb) {
+function ajaxReq(method, url, ok_cb, err_cb, data) {
   var xhr = j();
   xhr.open(method, url, true);
   var timeout = setTimeout(function() {
@@ -173,7 +173,7 @@ function ajaxReq(method, url, ok_cb, err_cb) {
   }
 //  console.log("XHR send:", method, url);
   try {
-    xhr.send();
+    xhr.send(data);
   } catch(err) {
     console.log("XHR EXC :", method, url, "->", err);
     err_cb(599, err);