From 0399a401eb2f44333b0666870a8a83afe21c247e Mon Sep 17 00:00:00 2001
From: serapath <dev@serapath.de>
Date: Fri, 18 May 2018 04:30:42 -0400
Subject: [PATCH] CompileTab: re-group event listeners

---
 src/app/tabs/compile-tab.js | 56 ++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js
index df2b2d2f1b..38201e774a 100644
--- a/src/app/tabs/compile-tab.js
+++ b/src/app/tabs/compile-tab.js
@@ -47,26 +47,6 @@ class CompileTab {
     })
 
     var compileTimeout = null
-    function scheduleCompilation () {
-      if (!opts.config.get('autoCompile')) {
-        return
-      }
-
-      if (compileTimeout) {
-        window.clearTimeout(compileTimeout)
-      }
-      compileTimeout = window.setTimeout(() => {
-        appAPI.runCompiler()
-      }, 300)
-    }
-
-    appEvents.editor.register('contentChanged', () => {
-      scheduleCompilation()
-    })
-
-    appEvents.editor.register('sessionSwitched', () => {
-      scheduleCompilation()
-    })
 
     // ----------------- autoCompile -----------------
     var autoCompileInput = compileContainer.querySelector('#autoCompile')
@@ -83,9 +63,24 @@ class CompileTab {
       opts.config.set('autoCompile', autoCompileInput.checked)
     })
 
-    // REGISTER EVENTS
+    appEvents.editor.register('contentChanged', () => {
+      scheduleCompilation()
+    })
+    appEvents.editor.register('sessionSwitched', () => {
+      scheduleCompilation()
+    })
+    function scheduleCompilation () {
+      if (!opts.config.get('autoCompile')) {
+        return
+      }
 
-    // compilationDuration
+      if (compileTimeout) {
+        window.clearTimeout(compileTimeout)
+      }
+      compileTimeout = window.setTimeout(() => {
+        appAPI.runCompiler()
+      }, 300)
+    }
     appEvents.compiler.register('compilationDuration', function tabHighlighting (speed) {
       if (speed > 1000) {
         warnCompilationSlow.setAttribute('title', `Last compilation took ${speed}ms. We suggest to turn off autocompilation.`)
@@ -94,7 +89,6 @@ class CompileTab {
         warnCompilationSlow.style.display = 'none'
       }
     })
-    // loadingCompiler
     appEvents.editor.register('contentChanged', function changedFile () {
       var compileTab = document.querySelector('.compileView')
       compileTab.style.color = styles.colors.red
@@ -123,14 +117,6 @@ class CompileTab {
       compileIcon.classList.remove(`${css.spinningIcon}`)
       compileIcon.setAttribute('title', '')
     })
-
-    var errorContainer = yo`<div class='error'></div>`
-
-    /* ------------------------------------------------
-      section CONTRACT DROPDOWN, DETAILS AND PUBLISH
-    ------------------------------------------------ */
-    var contractsDetails = {}
-
     appEvents.compiler.register('compilationFinished', function (success, data, source) {
       // reset the contractMetadata list (used by the publish action)
       contractsDetails = {}
@@ -162,7 +148,6 @@ class CompileTab {
         }
       }
     })
-
     appEvents.staticAnalysis.register('staticAnaysisWarning', (count) => {
       if (count) {
         opts.renderer.error(`Static Analysis raised ${count} warning(s) that requires your attention.`, $(errorContainer), {
@@ -172,6 +157,13 @@ class CompileTab {
       }
     })
 
+    var errorContainer = yo`<div class='error'></div>`
+
+    /* ------------------------------------------------
+      section CONTRACT DROPDOWN, DETAILS AND PUBLISH
+    ------------------------------------------------ */
+    var contractsDetails = {}
+
     var contractEl = yo`
       <div class="${css.container}">
         <select class="${css.contractNames}" disabled></select>