From 4680bfaee8013ab039a8f748c1554e610513ea22 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 14 May 2012 18:12:56 -0700
Subject: [PATCH 1/6] Upgrade yajsml version.

Fixes parent-relative redirects and prints results more nicely.
---
 src/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/package.json b/src/package.json
index 0b76ec2e..c46abbbf 100644
--- a/src/package.json
+++ b/src/package.json
@@ -10,7 +10,7 @@
                         "name": "Robin Buse" }
                      ],
   "dependencies"   : {
-                      "yajsml"              : "1.1.2",
+                      "yajsml"              : "1.1.3",
                       "request"             : "2.9.100",
                       "require-kernel"      : "1.0.5",
                       "resolve"             : "0.2.1",

From 97c7842d1919870f676681dd8cb39d7e7c39ad9e Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 14 May 2012 18:19:30 -0700
Subject: [PATCH 2/6] Remove unused line.

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

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 0003eedf..2dab8d54 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -185,7 +185,6 @@ require.setGlobalKeyPath("require");\n\
       buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
       buffer.push('<\/script>');
     } else {
-      file = ACE_SOURCE;
       buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
       buffer.push('<script type="text/javascript">');
       buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');

From 384523859e0ef7fa7d56513c7b648ec613b113d8 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 14 May 2012 18:19:54 -0700
Subject: [PATCH 3/6] Require ace2_common separately.

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

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 2dab8d54..f3a27a11 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -178,14 +178,18 @@ 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';
     if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
       buffer.push('<script type="text/javascript">');
       buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
+      buffer.push(Ace2Editor.EMBEDED[ACE_COMMON]);
       buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
       buffer.push('<\/script>');
     } else {
       buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
+      buffer.push('<script type="application/javascript" src="' + ACE_COMMON + '"><\/script>');
       buffer.push('<script type="text/javascript">');
       buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
       buffer.push('<\/script>');

From 1a2c6425e10a687ac5b0bc18727fec77f34e55e6 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 14 May 2012 17:53:05 -0700
Subject: [PATCH 4/6] Extract ace2_common into its own package.

---
 src/node/utils/tar.json | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index e691334d..93af6bf3 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -1,12 +1,7 @@
 {
   "pad.js": [
-    "jquery.js"
-  , "underscore.js"
-  , "security.js"
-  , "pad.js"
-  , "ace2_common.js"
+    "pad.js"
   , "pad_utils.js"
-  , "json2.js"
   , "pad_cookie.js"
   , "pad_editor.js"
   , "pad_editbar.js"
@@ -23,13 +18,9 @@
   , "farbtastic.js"
   ]
 , "timeslider.js": [
-    "jquery.js"
-  , "underscore.js"
-  , "security.js"
-  , "json2.js"
+    "timeslider.js"
   , "colorutils.js"
   , "draggable.js"
-  , "ace2_common.js"
   , "pad_utils.js"
   , "pad_cookie.js"
   , "pad_editor.js"
@@ -46,12 +37,10 @@
   , "broadcast.js"
   , "broadcast_slider.js"
   , "broadcast_revisions.js"
-  , "timeslider.js"
   ]
 , "ace2_inner.js": [
-    "ace2_common.js"
+    "ace2_inner.js"
   , "underscore.js"
-  , "rjquery.js"
   , "AttributePool.js"
   , "Changeset.js"
   , "ChangesetUtils.js"
@@ -66,6 +55,13 @@
   , "linestylefilter.js"
   , "domline.js"
   , "AttributeManager.js"
-  , "ace2_inner.js"
+  ]
+, "ace2_common.js": [
+    "ace2_common.js"
+  , "jquery.js"
+  , "rjquery.js"
+  , "underscore.js"
+  , "security.js"
+  , "json2.js"
   ]
 }

From 9b0e2287aa714ce41f3af71c555ec505855be186 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 14 May 2012 18:12:31 -0700
Subject: [PATCH 5/6] Add plugin framwork to common package.

---
 src/node/utils/tar.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index 93af6bf3..461e5197 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -63,5 +63,9 @@
   , "underscore.js"
   , "security.js"
   , "json2.js"
+  , "pluginfw/plugins.js"
+  , "pluginfw/hooks.js"
+  , "pluginfw/async.js"
+  , "pluginfw/parent_require.js"
   ]
 }

From a9eb2d4e319b8c796d66c00634081aa9a0715265 Mon Sep 17 00:00:00 2001
From: Chad Weider <cweider@oofn.net>
Date: Mon, 14 May 2012 19:01:00 -0700
Subject: [PATCH 6/6] Fix ordering of editer code loading operations.

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

diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index f3a27a11..8cb9f188 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -185,14 +185,10 @@ require.setGlobalKeyPath("require");\n\
       buffer.push('<script type="text/javascript">');
       buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
       buffer.push(Ace2Editor.EMBEDED[ACE_COMMON]);
-      buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
       buffer.push('<\/script>');
     } else {
       buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
       buffer.push('<script type="application/javascript" src="' + ACE_COMMON + '"><\/script>');
-      buffer.push('<script type="text/javascript">');
-      buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
-      buffer.push('<\/script>');
     }
   }
   function pushStyleTagsFor(buffer, files) {
@@ -264,8 +260,9 @@ require.setGlobalKeyPath("require");\n\
       pushStyleTagsFor(iframeHTML, includedCSS);
 
       var includedJS = [];
-      var $$INCLUDE_JS = function(filename) {includedJS.push(filename)};
       pushRequireScriptTo(iframeHTML);
+      pushScriptsTo(iframeHTML);
+
       // Inject my plugins into my child.
       iframeHTML.push('\
 <script type="text/javascript">\
@@ -280,7 +277,10 @@ require.setGlobalKeyPath("require");\n\
   });\
 </script>\
 ');
-      pushScriptsTo(iframeHTML);
+
+      iframeHTML.push('<script type="text/javascript">');
+      iframeHTML.push('require("ep_etherpad-lite/static/js/ace2_inner");');
+      iframeHTML.push('<\/script>');
 
       iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>');
       iframeHTML.push('</head><body id="innerdocbody" class="syntax" spellcheck="false">&nbsp;</body></html>');