Ensure correct button status

Aaron Imming · Aaron Imming · commit e3b33a5ff3f2 · 2019-07-09T11:48:33.000+08:00
diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
@@ -511,11 +511,17 @@ export default class View {
         });
 
         const startBot = limitations => {
-            const $runButtons = $('#runButton, #summaryRunButton');
-            const $stopButtons = $('#stopButton, #summaryStopButton');
-            $stopButtons.show();
-            $runButtons.hide();
-            $runButtons.prop('disabled', true);
+            const el_run_buttons = document.querySelectorAll('#runButton, #summaryRunButton');
+            const el_stop_buttons = document.querySelectorAll('#stopButton, #summaryStopButton');
+
+            el_run_buttons.forEach(el_run_button => {
+                el_run_button.style.display = 'none';
+                el_run_button.setAttributeNode(document.createAttribute('disabled'));
+            });
+            el_stop_buttons.forEach(el_stop_button => {
+                el_stop_button.style.display = 'initial';
+            });
+
             globalObserver.emit('summary.disable_clear');
             showSummary();
             this.blockly.run(limitations);
@@ -627,31 +633,47 @@ export default class View {
         this.blockly.stop();
     }
     addEventHandlers() {
+        const getRunButtonElements = () => document.querySelectorAll('#runButton, #summaryRunButton');
+        const getStopButtonElements = () => document.querySelectorAll('#stopButton, #summaryStopButton');
+
         window.addEventListener('storage', e => {
             window.onbeforeunload = null;
             if (e.key === 'activeToken' && !e.newValue) window.location.reload();
             if (e.key === 'realityCheckTime') hideRealityCheck();
         });
 
         globalObserver.register('Error', error => {
-            $('#runButton, #summaryRunButton').prop('disabled', false);
+            getRunButtonElements().forEach(el_run_button => el_run_button.removeAttribute('disabled'));
+
             if (error.error && error.error.error.code === 'InvalidToken') {
                 removeAllTokens();
                 updateTokenList();
                 this.stop();
             }
         });
 
+        globalObserver.register('bot.running', () => {
+            getRunButtonElements().forEach(el_run_button => {
+                el_run_button.style.display = 'none';
+                el_run_button.setAttributeNode(document.createAttribute('disabled'));
+            });
+            getStopButtonElements().forEach(el_stop_button => {
+                el_stop_button.style.display = 'inline-block';
+                el_stop_button.removeAttribute('disabled');
+            });
+        });
+
         globalObserver.register('bot.stop', () => {
-            const $runButtons = $('#runButton, #summaryRunButton');
-            const $stopButtons = $('#stopButton, #summaryStopButton');
-            if ($runButtons.is(':visible') || $stopButtons.is(':visible')) {
-                $runButtons.show();
-                $stopButtons.hide();
-
-                $stopButtons.prop('disabled', false);
-                $runButtons.prop('disabled', false);
-            }
+            // Enable run button, this event is emitted after the interpreter
+            // killed the API connection.
+            getStopButtonElements().forEach(el_stop_button => {
+                el_stop_button.style.display = 'none';
+                el_stop_button.removeAttribute('disabled');
+            });
+            getRunButtonElements().forEach(el_run_button => {
+                el_run_button.style.display = null;
+                el_run_button.removeAttribute('disabled');
+            });
         });
 
         globalObserver.register('bot.info', info => {
