From d5ac2bfb714e519d89b69c07ff0af19bef89ef62 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 28 May 2012 14:01:05 -0700
Subject: [PATCH] Explicitly require jQuery before using it.

---
 src/templates/pad.html        | 9 ++++-----
 src/templates/timeslider.html | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index e88df22dc..27e699274 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -318,11 +318,6 @@
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
         <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script>
         <script type="text/javascript">
-            if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
-            {
-              document.domain = document.domain; // for comet
-            }
-
             var clientVars = {};
             (function () {
               
@@ -336,6 +331,10 @@
               require.setLibraryURI(baseURL + "javascripts/lib");
               require.setGlobalKeyPath("require");
 
+              if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0))) {
+                document.domain = document.domain; // for comet
+              }
+
               var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
               plugins.baseURL = baseURL;
               plugins.update(function () {
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index a626ffade..ed5e206e2 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -100,11 +100,6 @@
 <script type="text/javascript" src="../../static/custom/timeslider.js"></script>
 
 <script type="text/javascript" >
-  if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
-  {
-    document.domain = document.domain; // for comet
-  }
-
   var clientVars = {};
   
   (function () {
@@ -119,6 +114,10 @@
     require.setLibraryURI(baseURL + "javascripts/lib");
     require.setGlobalKeyPath("require");
 
+    if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0))) {
+      document.domain = document.domain; // for comet
+    }
+
     var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
     plugins.baseURL = baseURL;