From 299a90b3bacf3409f2cb0f30336fe00463882755 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 28 May 2012 13:36:26 -0700
Subject: [PATCH 1/7] Fix paths for ace files.

---
 src/static/js/ace.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 8cb9f1884..60d73656e 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -177,10 +177,10 @@ require.setGlobalKeyPath("require");\n\
   }
   function pushScriptsTo(buffer) {
     /* Folling is for packaging regular expression. */
-    /* $$INCLUDE_JS("../javascripts/src/ace2_inner.js?callback=require.define"); */
-    /* $$INCLUDE_JS("../javascripts/src/ace2_common.js?callback=require.define"); */
-    var ACE_SOURCE = '../javascripts/src/ace2_inner.js?callback=require.define';
-    var ACE_COMMON = '../javascripts/src/ace2_common.js?callback=require.define';
+    /* $$INCLUDE_JS("../javascripts/lib/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define"); */
+    /* $$INCLUDE_JS("../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"); */
+    var ACE_SOURCE = '../javascripts/lib/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define';
+    var ACE_COMMON = '../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define';
     if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
       buffer.push('<script type="text/javascript">');
       buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);

From c4c30bf725fbf8cbf86590eca11f605d2e43ed2a Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 28 May 2012 14:49:47 -0700
Subject: [PATCH 2/7] Correct parent_require path.

---
 src/static/js/ace.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 60d73656e..7ae42cc91 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -266,7 +266,7 @@ require.setGlobalKeyPath("require");\n\
       // Inject my plugins into my child.
       iframeHTML.push('\
 <script type="text/javascript">\
-  parent_req = require("./pluginfw/parent_require.js");\
+  parent_req = require("ep_etherpad-lite/static/js/pluginfw/parent_require");\
   parent_req.getRequirementFromParent(require, "ep_etherpad-lite/static/js/pluginfw/hooks");\
   parent_req.getRequirementFromParent(require, "ep_etherpad-lite/static/js/pluginfw/plugins");\
   parent_req.getRequirementFromParent(require, "./pluginfw/hooks");\

From 595fc5710e007ea526e98f49e5e5a53d5259de61 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 28 May 2012 13:52:04 -0700
Subject: [PATCH 3/7] Add ace2_common to bottom of the page includes.

---
 src/templates/pad.html        | 1 +
 src/templates/timeslider.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 9a6ff9dd2..e88df22dc 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -316,6 +316,7 @@
         <script type="text/javascript" src="../static/js/jquery.js"></script>
         <script type="text/javascript" src="../socket.io/socket.io.js"></script>
         <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)))
             {
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 73f246b80..a626ffade 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -96,6 +96,7 @@
 <script type="text/javascript" src="../../static/js/jquery.js"></script>
 <script type="text/javascript" src="../../socket.io/socket.io.js"></script>
 <script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.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" src="../../static/custom/timeslider.js"></script>
 
 <script type="text/javascript" >

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 4/7] 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;
     

From 96ab3dc3b46a0f5d02d8ddb64d7ba2dcdb6b8aa6 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 28 May 2012 13:50:55 -0700
Subject: [PATCH 5/7] jQuery is packaged - this is pure duplication.

---
 src/static/js/ace.js          | 2 +-
 src/templates/pad.html        | 3 ++-
 src/templates/timeslider.html | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 7ae42cc91..87068d07d 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -238,7 +238,6 @@ require.setGlobalKeyPath("require");\n\
 
       iframeHTML.push(doctype);
       iframeHTML.push("<html><head>");
-      iframeHTML.push('<script type="text/javascript" src="../static/js/jquery.js"></script>');
 
       hooks.callAll("aceInitInnerdocbodyHead", {
         iframeHTML: iframeHTML
@@ -279,6 +278,7 @@ require.setGlobalKeyPath("require");\n\
 ');
 
       iframeHTML.push('<script type="text/javascript">');
+      iframeHTML.push('$ = jQuery = require("ep_etherpad-lite/static/js/rjquery").jQuery; // Expose jQuery #HACK');
       iframeHTML.push('require("ep_etherpad-lite/static/js/ace2_inner");');
       iframeHTML.push('<\/script>');
 
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 27e699274..6c6979dbc 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -313,7 +313,6 @@
 
         <% e.begin_block("scripts"); %>
         <script type="text/javascript" src="../static/js/require-kernel.js"></script>
-        <script type="text/javascript" src="../static/js/jquery.js"></script>
         <script type="text/javascript" src="../socket.io/socket.io.js"></script>
         <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>
@@ -331,6 +330,8 @@
               require.setLibraryURI(baseURL + "javascripts/lib");
               require.setGlobalKeyPath("require");
 
+              $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
+
               if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0))) {
                 document.domain = document.domain; // for comet
               }
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index ed5e206e2..8e690d314 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -93,7 +93,6 @@
 </div>
 
 <script type="text/javascript" src="../../static/js/require-kernel.js"></script>
-<script type="text/javascript" src="../../static/js/jquery.js"></script>
 <script type="text/javascript" src="../../socket.io/socket.io.js"></script>
 <script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.js?callback=require.define"></script>
 <script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"></script>
@@ -114,6 +113,8 @@
     require.setLibraryURI(baseURL + "javascripts/lib");
     require.setGlobalKeyPath("require");
 
+    $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
+
     if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0))) {
       document.domain = document.domain; // for comet
     }

From 7f9bfd6b260d366277f98b40a813daa37583900f Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 28 May 2012 13:55:19 -0700
Subject: [PATCH 6/7] Add comments to templates.

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

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 6c6979dbc..daca671ec 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -314,8 +314,12 @@
         <% e.begin_block("scripts"); %>
         <script type="text/javascript" src="../static/js/require-kernel.js"></script>
         <script type="text/javascript" src="../socket.io/socket.io.js"></script>
+
+        <!-- Include base packages manually (this help with debugging) -->
         <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>
+
+        <!-- Bootstrap page -->
         <script type="text/javascript">
             var clientVars = {};
             (function () {
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 8e690d314..77fdacd03 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -94,10 +94,14 @@
 
 <script type="text/javascript" src="../../static/js/require-kernel.js"></script>
 <script type="text/javascript" src="../../socket.io/socket.io.js"></script>
+
+<!-- Include base packages manually (this help with debugging) -->
 <script type="text/javascript" src="../../javascripts/lib/ep_etherpad-lite/static/js/timeslider.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" src="../../static/custom/timeslider.js"></script>
 
+<!-- Bootstrap -->
 <script type="text/javascript" >
   var clientVars = {};
   

From a8340dfbbe096adbac1e1fe02fd8f3c8630c6e98 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 28 May 2012 13:15:08 -0700
Subject: [PATCH 7/7] Remove the libraries that are a part of ace2_common
 package.

---
 src/node/utils/tar.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index 461e51979..15ce68e27 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -40,11 +40,9 @@
   ]
 , "ace2_inner.js": [
     "ace2_inner.js"
-  , "underscore.js"
   , "AttributePool.js"
   , "Changeset.js"
   , "ChangesetUtils.js"
-  , "security.js"
   , "skiplist.js"
   , "virtual_lines.js"
   , "cssmanager.js"