From 1816d390ce65faaf3972e732288ef74c040ea2ab Mon Sep 17 00:00:00 2001
From: Wu Han <wuhanstudio@qq.com>
Date: Thu, 7 Jan 2021 16:55:08 +0000
Subject: [PATCH] [fix] re-enable upload after re-submit

---
 resources/js/script.js        | 38 ++++++++++++++++++-----------------
 resources/js/socket_script.js | 12 +++++------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/resources/js/script.js b/resources/js/script.js
index ab66c3f..ed9e0a9 100644
--- a/resources/js/script.js
+++ b/resources/js/script.js
@@ -62,44 +62,32 @@ $( document ).ready( () => {
 
     $( "#ulysses16_submit" ).click(function() {
         upload_leaderboard('ulysses16');
-        $('#ulysses16_submit').removeClass('btn-primary');
-        $('#ulysses16_submit').text('Submitted');
-        $('#ulysses16_submit').prop('disabled', true);
+        disable_btn($('#ulysses16_submit'));
     });
 
     $( "#att48_submit" ).click(function() {
         upload_leaderboard('att48');
-        $('#att48_submit').removeClass('btn-primary');
-        $('#att48_submit').text('Submitted');
-        $('#att48_submit').prop('disabled', true);
+        disable_btn($('#att48_submit'));
     });
 
     $( "#st70_submit" ).click(function() {
         upload_leaderboard('st70');
-        $('#st70_submit').removeClass('btn-primary');
-        $('#st70_submit').text('Submitted');
-        $('#st70_submit').prop('disabled', true);
+        disable_btn($('#st70_submit'));
     });
 
     $( "#a280_submit" ).click(function() {
         upload_leaderboard('a280');
-        $('#a280_submit').removeClass('btn-primary');
-        $('#a280_submit').text('Submitted');
-        $('#a280_submit').prop('disabled', true);
+        disable_btn($('#a280_submit'));
     });
 
     $( "#pcb442_submit" ).click(function() {
         upload_leaderboard('pcb442');
-        $('#pcb442_submit').removeClass('btn-primary');
-        $('#pcb442_submit').text('Submitted');
-        $('#pcb442_submit').prop('disabled', true);
+        disable_btn($('#pcb442_submit'));
     });
 
     $( "#dsj1000_submit" ).click(function() {
         upload_leaderboard('dsj1000');
-        $('#dsj1000_submit').removeClass('btn-primary');
-        $('#dsj1000_submit').text('Submitted');
-        $('#dsj1000_submit').prop('disabled', true);
+        disable_btn($('#dsj1000_submit'));
     });
 
     // Initialize file uploader
@@ -170,6 +158,20 @@ $( document ).ready( () => {
   });
 })
 
+function disable_btn(btn) {
+    btn.show();
+    btn.removeClass('btn-primary');
+    btn.text('Submitted');
+    btn.prop('disabled', true);
+}
+
+function enable_btn(btn) {
+    btn.show();
+    btn.addClass('btn-primary');
+    btn.text('Submit');
+    btn.prop('disabled', false);
+}
+
 function upload_leaderboard(name) {
     obj = {}
     obj.name = name;
diff --git a/resources/js/socket_script.js b/resources/js/socket_script.js
index 4a283af..01d1f1e 100644
--- a/resources/js/socket_script.js
+++ b/resources/js/socket_script.js
@@ -107,42 +107,42 @@ socket.on('result', (res) => {
             my_res.ulysses16.fitness = e.fitness
             $("#ulysses16_your").text(e.fitness);
             if(e.fitness > 0) {
-                $('#ulysses16_submit').show();
+                enable_btn($('#ulysses16_submit'))
             }
         }
         if(e.name === "att48.txt") {
             my_res.att48.fitness = e.fitness
             $("#att48_your").text(e.fitness);
             if(e.fitness > 0) {
-                $('#att48_submit').show();
+                enable_btn($('#att48_submit'))
             }
         }
         if(e.name === "st70.txt") {
             my_res.st70.fitness = e.fitness
             $("#st70_your").text(e.fitness)
             if(e.fitness > 0) {
-                $('#st70_submit').show();
+                enable_btn($('#st70_submit'))
             }
         }
         if(e.name === "a280.txt") {
             my_res.a280.fitness = e.fitness
             $("#a280_your").text(e.fitness)
             if(e.fitness > 0) {
-                $('#a280_submit').show();
+                enable_btn($('#a280_submit'))
             }
         }
         if(e.name === "pcb442.txt") {
             my_res.pcb442.fitness = e.fitness
             $("#pcb442_your").text(e.fitness)
             if(e.fitness > 0) {
-                $('#pcb442_submit').show();
+                enable_btn($('#pcb442_submit'))
             }
         }
         if(e.name === "dsj1000.txt") {
             my_res.dsj1000.fitness = e.fitness
             $("#dsj1000_your").text(e.fitness)
             if(e.fitness > 0) {
-                $('#dsj1000_submit').show();
+                enable_btn($('#dsj1000_submit'))
             }
         }
     });