From 6cd391d3fb33f5c59fd0d1deaaa18c1034e0bd81 Mon Sep 17 00:00:00 2001
From: Egil Moeller <egil.moller@freecode.no>
Date: Thu, 1 Mar 2012 20:18:03 +0100
Subject: [PATCH] Fixed timeslider which I broke a few minutes ago

---
 src/node/utils/tar.json    |  2 --
 src/static/timeslider.html | 25 +++++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index e922dddeb..a905eb442 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -5,7 +5,6 @@
   , "pad.js"
   , "ace2_common.js"
   , "pad_utils.js"
-  , "plugins.js"
   , "undo-xpopup.js"
   , "json2.js"
   , "pad_cookie.js"
@@ -27,7 +26,6 @@
 , "timeslider.js": [
     "jquery.js"
   , "security.js"
-  , "plugins.js"
   , "undo-xpopup.js"
   , "json2.js"
   , "colorutils.js"
diff --git a/src/static/timeslider.html b/src/static/timeslider.html
index 391edb73b..e807e258c 100644
--- a/src/static/timeslider.html
+++ b/src/static/timeslider.html
@@ -197,21 +197,26 @@
 </div>
 </div>
 
-<script type="text/javascript" src="../../static/js/require-kernel.js"></script>
-<script type="text/javascript" src="../../socket.io/socket.io.js"></script>
-<script type="text/javascript" src="../../minified/timeslider.js"></script>
-<script type="text/javascript" src="../../static/custom/timeslider.js"></script>
+<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="../../../minified/timeslider.js"></script>
+<script type="text/javascript" src="../../../static/custom/timeslider.js"></script>
 <script type="text/javascript" >
   var clientVars = {};
   (function () {
-    require.setRootURI("../minified/");
-    require.setLibraryURI("../minified/plugins/");
+    require.setRootURI("../../../minified/");
+    require.setLibraryURI("../../../minified/plugins/");
     require.setGlobalKeyPath("require");
-    require('ep_etherpad-lite/static/js/timeslider').init();
 
-    /* TODO: These globals shouldn't exist. */
-    padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
-    padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
+    var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
+    plugins.update(function () {
+      require('ep_etherpad-lite/static/js/timeslider').init();
+
+      /* TODO: These globals shouldn't exist. */
+      padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
+      padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
+    });
   })();
 </script>
 </body>