Fix race condition in javascript loading before UI

web/client/compatibility/base.js

@@ -1,20 +1,5 @@
 regcolors = ['#60AE3F', '#723160', '#2A80A2', '#9E66BD', '#BC8D6B', '#3F3EAC', '#BC48B8', '#6B7C76', '#5FAC7F', '#A69B71', '#874535', '#AD49BF', '#73356F', '#55A4AC', '#988590', '#505C62', '#404088', '#56726B', '#BAAC62', '#454066', '#BCAEAA', '#4E7F6A', '#3960B5', '#295231', '#3B37A5', '#6A9191', '#976394', '#7F957D', '#B7AFBD', '#BD4A70', '#A35169', '#2F2D95', '#8879A8', '#8D3A8E', '#636E7C', '#82688D', '#9FA893', '#2A6885', '#812C87', '#568E71', '#6FA0B2', '#7B7928', '#57BD86', '#6BBC9A', '#807FB3', '#922AAD', '#AB5D98', '#9C943A', '#796880', '#294870', '#528054', '#4ABBA2', '#87437B', '#AA4E73', '#2893AC', '#5AA383', '#A5714D', '#648186', '#68BA37', '#466A89', '#5CB871', '#3D8267', '#28B930', '#5E6C6F', '#5C6772', '#389E58', '#34B69B', '#3CA46A', '#4F4691', '#4D48A1', '#836CB1', '#2B6948', '#4F42BB', '#549B68', '#69B563', '#B39F5C', '#A37841', '#7858B4', '#577244', '#2B7DAD'];
 
-function p(a) { console.log(a); }
-//function DA(a) { p("DA: "+a); }
-//function DS(a) { p("DS: "+a); }
-//function DH(a) { p("DH: "+a); }
-function DA(a) {}
-function DS(a) {}
-function DH(a) {}
-
-if (window.location.port == 3000) {
-  // for meteor development
-  STREAM_URL = "http://localhost:3002/qira";
-} else {
-  STREAM_URL = window.location.origin+"/qira";
-}
-
 // ** history ***
 function push_history(reason, replace) {
   var json = {};

web/client/compatibility/early.js

@@ -0,0 +1,10 @@
+function p(a) { console.log(a); }
+//function DA(a) { p("DA: "+a); }
+//function DS(a) { p("DS: "+a); }
+//function DH(a) { p("DH: "+a); }
+function DA(a) {}
+function DS(a) {}
+function DH(a) {}
+
+STREAM_URL = window.location.origin+"/qira";
+

web/client/ui.js

@@ -1,5 +1,6 @@
 // Scripts to load after UI has been initialized.
-var scripts = ["/client/controls.js", "/client/ida.js", "/client/idump.js", "/client/regmem.js",
+var scripts = ["/client/compatibility/base.js", "/client/compatibility/highlight.js",
+               "/client/controls.js", "/client/ida.js", "/client/idump.js", "/client/regmem.js",
                "/client/vtimeline.js", "/client/strace.js", "/client/haddrline.js",
                "/client/static/static.js", "/client/static/graph.js"];
 
@@ -115,7 +116,7 @@ $(document).ready(function() {
   function is_done() {
     p("loading UI");
     $.holdReady(true);
-    //UI elements now exist in the DOM.
+    // UI elements now exist in the DOM.
     head.load(scripts);
     $.holdReady(false);
   }

web/index.html

@@ -21,13 +21,14 @@
   <script type="text/javascript" src="/client/compatibility/head.core.min.js"></script>
 
   <script type="text/javascript" src="/client/compatibility/fakemeteor.js"></script>
-  <script type="text/javascript" src="/client/compatibility/base.js"></script>
   <script type="text/javascript" src="/client/compatibility/bignum.js"></script>
   <script type="text/javascript" src="/client/compatibility/socket.io.min.js"></script>
-  <script type="text/javascript" src="/client/compatibility/highlight.js"></script>
   <script type="text/javascript" src='/client/compatibility/jquery.contextMenu.js'></script>
   <script type="text/javascript" src='/client/compatibility/jquery.ui.position.js'></script>
   <script type="text/javascript" src="/client/compatibility/wcDocker.window-patch.js"></script>
+  <script type="text/javascript" src="/client/compatibility/early.js"></script>
+
+  <!-- kick off the ui -->
   <script type="text/javascript" src="/client/ui.js"></script>
 
   <script type="text/template" id="control-template">