From 72b556a09b9ffe79f92f5228cfe64f991306d8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 14 Nov 2017 19:38:55 +0100
Subject: [PATCH] tools: JS node: cleanup

---
 tools/proxy_node.html | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tools/proxy_node.html b/tools/proxy_node.html
index f7929ce2..5661c18f 100644
--- a/tools/proxy_node.html
+++ b/tools/proxy_node.html
@@ -21,14 +21,21 @@ $(function() {
     const getBtn = $("#getBtn");
     const getDropdown = $("#getDropdown");
     const listenBtn = $("#listenBtn").click(function(){onGet('LISTEN');});
-    const getStopBtn = $("#getStopBtn").detach().click(function(){
+    const setGetRequest = function() {
+        getBtn.button('loading');
+        getStopBtn.appendTo(getTools);
+        getDropdown.hide();
+    }
+    const clearGetRequest = function() {
         if (request === undefined)
             return;
         request.abort();
+        request = undefined;
         getStopBtn.detach();
         getDropdown.show();
-        request = undefined;
-    });
+        getBtn.button('reset');
+    }
+    const getStopBtn = $("#getStopBtn").detach().click(clearGetRequest);
     const putBtn = $("#putBtn");
     const result = $("#dhtResult");
     const group = $('<ul class="list-group"/>').appendTo(result);
@@ -36,14 +43,12 @@ $(function() {
         if (request !== undefined)
             return false;
         const input = $("#getKey").val();
+        group.empty();
         request = new XMLHttpRequest();
         request.onreadystatechange = function(event) {
             if (this.readyState >= XMLHttpRequest.LOADING) {
                 if (this.readyState == XMLHttpRequest.DONE) {
-                    getBtn.button('reset');
-                    getStopBtn.detach();
-                    getDropdown.show();
-                    request = undefined;
+                    clearGetRequest();
                 }
                 if (this.status === 200) {
                     group.empty();
@@ -61,17 +66,12 @@ $(function() {
             }
         };
         request.onerror = function(event) {
-            getBtn.button('reset');
-            getStopBtn.detach();
-            getDropdown.show();
+            clearGetRequest();
             group.empty().append($('<li class="list-group-item list-group-item-danger"/>').text("Error loading content."));
-            request = undefined;
         };
         request.open(method, "http://127.0.0.1:8080/" + input, true);
         request.send(null);
-        getBtn.button('loading');
-        getStopBtn.appendTo(getTools);
-        getDropdown.hide();
+        setGetRequest();
         return false;
     };
 
-- 
GitLab