From 3123a0a25a8ceb32927b6abfaece1a7cd4afdd59 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 30 Jan 2012 19:24:50 -0800
Subject: [PATCH] Do not assign to globals until after initialization.

---
 static/pad.html        | 16 +++++++---------
 static/timeslider.html |  9 ++++-----
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/static/pad.html b/static/pad.html
index e2e4690c2..b8d48028d 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -11,9 +11,6 @@
         <link href="../static/custom/pad.css" rel="stylesheet">
         <style title="dynamicsyntax"></style>
 
-        <script>
-            var clientVars = {};  
-        </script>
         <script src="../static/js/require-kernel.js"></script>
         <script src="../socket.io/socket.io.js"></script>
         <script src="../minified/pad.js"></script>
@@ -297,14 +294,15 @@
         </div>
 
         <script>
-            /* TODO: These globals shouldn't exist. */
-            pad = require('/pad').pad;
-            chat = require('/chat').chat;
-            padeditbar = require('/pad_editbar').padeditbar;
-            padimpexp = require('/pad_impexp').padimpexp;
-
+            var clientVars = {};
             (function () {
               require('/pad').init();
+
+              /* TODO: These globals shouldn't exist. */
+              pad = require('/pad').pad;
+              chat = require('/chat').chat;
+              padeditbar = require('/pad_editbar').padeditbar;
+              padimpexp = require('/pad_impexp').padimpexp;
             }());
         </script>
         
diff --git a/static/timeslider.html b/static/timeslider.html
index cbcb3e366..fc8e2d4e3 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -205,13 +205,12 @@
 
 <script>
   var clientVars = {};
-
-  /* TODO: These globals shouldn't exist. */
-  padeditbar = require('/pad_editbar').padeditbar;
-  padimpexp = require('/pad_impexp').padimpexp;
-
   (function () {
     var TimeSlider = require('/timeslider').init();
+
+    /* TODO: These globals shouldn't exist. */
+    padeditbar = require('/pad_editbar').padeditbar;
+    padimpexp = require('/pad_impexp').padimpexp;
   })();
 </script>
 </body>