From 852c128d9d5d676e61f04e585cd21b3542e04cd5 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 1 Sep 2016 23:31:35 +0100
Subject: [PATCH] Merge the two soljsonSources blocks

---
 src/app.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/app.js b/src/app.js
index 765546850d..603b8c2818 100644
--- a/src/app.js
+++ b/src/app.js
@@ -482,23 +482,6 @@ var run = function () {
     }
   };
 
-  if (window.soljsonSources !== undefined) {
-    var latestRelease = null;
-    if (window.soljsonReleases !== undefined) {
-      for (var release in window.soljsonReleases) {
-        if (latestRelease === null || semver.gt(release, latestRelease)) {
-          latestRelease = release;
-        }
-      }
-    }
-    if (latestRelease === null) {
-      latestRelease = 'soljson-latest.js';
-    }
-    loadVersion(queryParams.get().version || latestRelease);
-  } else {
-    loadVersion('soljson.js');
-  }
-
   document.querySelector('#optimize').addEventListener('change', function () {
     queryParams.update({ optimize: document.querySelector('#optimize').checked });
     compiler.compile();
@@ -517,6 +500,7 @@ var run = function () {
 
   // var soljsonSources is provided by bin/list.js
   if (window.soljsonSources !== undefined) {
+    // populate selector list with available versions
     $.each(soljsonSources, function (i, file) {
       if (file) {
         var version = file.replace(/soljson-(.*).js/, '$1');
@@ -524,6 +508,22 @@ var run = function () {
       }
     });
     $('#versionSelector').attr('disabled', false);
+
+    // load initial verison
+    var latestRelease = null;
+    if (window.soljsonReleases !== undefined) {
+      for (var release in window.soljsonReleases) {
+        if (latestRelease === null || semver.gt(release, latestRelease)) {
+          latestRelease = release;
+        }
+      }
+    }
+    if (latestRelease === null) {
+      latestRelease = 'soljson-latest.js';
+    }
+    loadVersion(queryParams.get().version || latestRelease);
+  } else {
+    loadVersion('soljson.js');
   }
 
   // always include the local version