diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2012-03-01 20:18:03 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2012-03-01 20:18:03 +0100 |
| commit | 6cd391d3fb33f5c59fd0d1deaaa18c1034e0bd81 (patch) | |
| tree | 4ccde067082781f364e8cfcc57a30f18c877c76a /src/static | |
| parent | df531a7b2bf115f51f2a3bb41f30d2e078bbd55f (diff) | |
| download | etherpad-lite-6cd391d3fb33f5c59fd0d1deaaa18c1034e0bd81.zip | |
Fixed timeslider which I broke a few minutes ago
Diffstat (limited to 'src/static')
| -rw-r--r-- | src/static/timeslider.html | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/static/timeslider.html b/src/static/timeslider.html index 391edb73..e807e258 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> |