summaryrefslogtreecommitdiff
path: root/src/static
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2012-02-26 17:48:17 +0100
committerEgil Moeller <egil.moller@freecode.no>2012-02-26 17:48:17 +0100
commit763361a7c938ca00a73e1ebc00dc08b8ce39ebaf (patch)
tree24a33443ba8ea101e3f65196c4ab205e94169fc9 /src/static
parentfd5b7c1080d605caba658c0c4913e298ef0184c2 (diff)
downloadetherpad-lite-763361a7c938ca00a73e1ebc00dc08b8ce39ebaf.zip
First stab at getting client side require(plugin/..) to work from within etherpad
Diffstat (limited to 'src/static')
-rw-r--r--src/static/js/Changeset.js2
-rw-r--r--src/static/js/ace.js8
-rw-r--r--src/static/js/ace2_common.js2
-rw-r--r--src/static/js/ace2_inner.js24
-rw-r--r--src/static/js/broadcast.js12
-rw-r--r--src/static/js/changesettracker.js4
-rw-r--r--src/static/js/chat.js4
-rw-r--r--src/static/js/collab_client.js2
-rw-r--r--src/static/js/contentcollector.js4
-rw-r--r--src/static/js/domline.js6
-rw-r--r--src/static/js/linestylefilter.js6
-rw-r--r--src/static/js/pad.js46
-rw-r--r--src/static/js/pad_connectionstatus.js2
-rw-r--r--src/static/js/pad_docbar.js4
-rw-r--r--src/static/js/pad_editbar.js6
-rw-r--r--src/static/js/pad_editor.js6
-rw-r--r--src/static/js/pad_impexp.js2
-rw-r--r--src/static/js/pad_modals.js4
-rw-r--r--src/static/js/pad_savedrevs.js4
-rw-r--r--src/static/js/pad_userlist.js2
-rw-r--r--src/static/js/pad_utils.js8
-rw-r--r--src/static/js/timeslider.js20
-rw-r--r--src/static/js/undomodule.js4
-rw-r--r--src/static/pad.html10
-rw-r--r--src/static/timeslider.html6
25 files changed, 99 insertions, 99 deletions
diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js
index 715836d5..3108fc02 100644
--- a/src/static/js/Changeset.js
+++ b/src/static/js/Changeset.js
@@ -25,7 +25,7 @@
* limitations under the License.
*/
-var AttributePoolFactory = require("/AttributePoolFactory");
+var AttributePoolFactory = require("ep_etherpad-lite/static/js/AttributePoolFactory");
var _opt = null;
diff --git a/src/static/js/ace.js b/src/static/js/ace.js
index 04930910..3f64e19f 100644
--- a/src/static/js/ace.js
+++ b/src/static/js/ace.js
@@ -28,7 +28,7 @@ Ace2Editor.registry = {
nextId: 1
};
-var plugins = require('/plugins').plugins;
+var plugins = require('ep_etherpad-lite/static/js/plugins').plugins;
function Ace2Editor()
{
@@ -233,14 +233,14 @@ function Ace2Editor()
if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
buffer.push('<script type="text/javascript">');
buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
- buffer.push('require("/ace2_inner");');
+ buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
buffer.push('<\/script>');
} else {
file = ACE_SOURCE;
file = file.replace(/^\.\.\/static\/js\//, '../minified/');
buffer.push('<script type="application/javascript" src="' + file + '"><\/script>');
buffer.push('<script type="text/javascript">');
- buffer.push('require("/ace2_inner");');
+ buffer.push('require("ep_etherpad-lite/static/js/ace2_inner");');
buffer.push('<\/script>');
}
}
@@ -322,7 +322,7 @@ function Ace2Editor()
<script type="text/javascript">\
require.define("/plugins", null);\n\
require.define("/plugins.js", function (require, exports, module) {\
- module.exports = parent.parent.require("/plugins");\
+ module.exports = parent.parent.require("ep_etherpad-lite/static/js/plugins");\
});\
</script>\
');
diff --git a/src/static/js/ace2_common.js b/src/static/js/ace2_common.js
index b4c72a92..7f79f1c0 100644
--- a/src/static/js/ace2_common.js
+++ b/src/static/js/ace2_common.js
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-var Security = require('/security');
+var Security = require('ep_etherpad-lite/static/js/security');
function isNodeText(node)
{
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index d2113574..67535d86 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-var Ace2Common = require('/ace2_common');
+var Ace2Common = require('ep_etherpad-lite/static/js/ace2_common');
// Extract useful method defined in the other module.
var isNodeText = Ace2Common.isNodeText;
var object = Ace2Common.object;
@@ -37,17 +37,17 @@ var binarySearchInfinite = Ace2Common.binarySearchInfinite;
var htmlPrettyEscape = Ace2Common.htmlPrettyEscape;
var map = Ace2Common.map;
-var makeChangesetTracker = require('/changesettracker').makeChangesetTracker;
-var colorutils = require('/colorutils').colorutils;
-var makeContentCollector = require('/contentcollector').makeContentCollector;
-var makeCSSManager = require('/cssmanager').makeCSSManager;
-var domline = require('/domline').domline;
-var AttribPool = require('/AttributePoolFactory').createAttributePool;
-var Changeset = require('/Changeset');
-var linestylefilter = require('/linestylefilter').linestylefilter;
-var newSkipList = require('/skiplist').newSkipList;
-var undoModule = require('/undomodule').undoModule;
-var makeVirtualLineView = require('/virtual_lines').makeVirtualLineView;
+var makeChangesetTracker = require('ep_etherpad-lite/static/js/changesettracker').makeChangesetTracker;
+var colorutils = require('ep_etherpad-lite/static/js/colorutils').colorutils;
+var makeContentCollector = require('ep_etherpad-lite/static/js/contentcollector').makeContentCollector;
+var makeCSSManager = require('ep_etherpad-lite/static/js/cssmanager').makeCSSManager;
+var domline = require('ep_etherpad-lite/static/js/domline').domline;
+var AttribPool = require('ep_etherpad-lite/static/js/AttributePoolFactory').createAttributePool;
+var Changeset = require('ep_etherpad-lite/static/js/Changeset');
+var linestylefilter = require('ep_etherpad-lite/static/js/linestylefilter').linestylefilter;
+var newSkipList = require('ep_etherpad-lite/static/js/skiplist').newSkipList;
+var undoModule = require('ep_etherpad-lite/static/js/undomodule').undoModule;
+var makeVirtualLineView = require('ep_etherpad-lite/static/js/virtual_lines').makeVirtualLineView;
function OUTER(gscope)
{
diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js
index 4a7b0168..f0a62701 100644
--- a/src/static/js/broadcast.js
+++ b/src/static/js/broadcast.js
@@ -20,12 +20,12 @@
* limitations under the License.
*/
-var makeCSSManager = require('/cssmanager').makeCSSManager;
-var domline = require('/domline').domline;
-var AttribPool = require('/AttributePoolFactory').createAttributePool;
-var Changeset = require('/Changeset');
-var linestylefilter = require('/linestylefilter').linestylefilter;
-var colorutils = require('/colorutils').colorutils;
+var makeCSSManager = require('ep_etherpad-lite/static/js/cssmanager').makeCSSManager;
+var domline = require('ep_etherpad-lite/static/js/domline').domline;
+var AttribPool = require('ep_etherpad-lite/static/js/AttributePoolFactory').createAttributePool;
+var Changeset = require('ep_etherpad-lite/static/js/Changeset');
+var linestylefilter = require('ep_etherpad-lite/static/js/linestylefilter').linestylefilter;
+var colorutils = require('ep_etherpad-lite/static/js/colorutils').colorutils;
// These parameters were global, now they are injected. A reference to the
// Timeslider controller would probably be more appropriate.
diff --git a/src/static/js/changesettracker.js b/src/static/js/changesettracker.js
index e34dc107..e5275a69 100644
--- a/src/static/js/changesettracker.js
+++ b/src/static/js/changesettracker.js
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-var AttribPool = require('/AttributePoolFactory').createAttributePool;
-var Changeset = require('/Changeset');
+var AttribPool = require('ep_etherpad-lite/static/js/AttributePoolFactory').createAttributePool;
+var Changeset = require('ep_etherpad-lite/static/js/Changeset');
function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
{
diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index fb2acac1..943ab09f 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-var padutils = require('/pad_utils').padutils;
-var padcookie = require('/pad_cookie').padcookie;
+var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils;
+var padcookie = require('ep_etherpad-lite/static/js/pad_cookie').padcookie;
var chat = (function()
{
diff --git a/src/static/js/collab_client.js b/src/static/js/collab_client.js
index ec575fe0..384b49d6 100644
--- a/src/static/js/collab_client.js
+++ b/src/static/js/collab_client.js
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-var chat = require('/chat').chat;
+var chat = require('ep_etherpad-lite/static/js/chat').chat;
// Dependency fill on init. This exists for `pad.socket` only.
// TODO: bind directly to the socket.
diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js
index 96dc4b7d..76b20c92 100644
--- a/src/static/js/contentcollector.js
+++ b/src/static/js/contentcollector.js
@@ -25,8 +25,8 @@
var _MAX_LIST_LEVEL = 8;
-var Changeset = require('/Changeset');
-var plugins = require('/plugins').plugins;
+var Changeset = require('ep_etherpad-lite/static/js/Changeset');
+var plugins = require('ep_etherpad-lite/static/js/plugins').plugins;
function sanitizeUnicode(s)
{
diff --git a/src/static/js/domline.js b/src/static/js/domline.js
index 15528bf7..71ad2c52 100644
--- a/src/static/js/domline.js
+++ b/src/static/js/domline.js
@@ -26,9 +26,9 @@
// requires: plugins
// requires: undefined
-var Security = require('/security');
-var plugins = require('/plugins').plugins;
-var map = require('/ace2_common').map;
+var Security = require('ep_etherpad-lite/static/js/security');
+var plugins = require('ep_etherpad-lite/static/js/plugins').plugins;
+var map = require('ep_etherpad-lite/static/js/ace2_common').map;
var domline = {};
domline.noop = function()
diff --git a/src/static/js/linestylefilter.js b/src/static/js/linestylefilter.js
index 4b455724..b75ac200 100644
--- a/src/static/js/linestylefilter.js
+++ b/src/static/js/linestylefilter.js
@@ -28,9 +28,9 @@
// requires: plugins
// requires: undefined
-var Changeset = require('/Changeset');
-var plugins = require('/plugins').plugins;
-var map = require('/ace2_common').map;
+var Changeset = require('ep_etherpad-lite/static/js/Changeset');
+var plugins = require('ep_etherpad-lite/static/js/plugins').plugins;
+var map = require('ep_etherpad-lite/static/js/ace2_common').map;
var linestylefilter = {};
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 537ebed2..06125159 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -26,29 +26,29 @@ var socket;
// These jQuery things should create local references, but for now `require()`
// assigns to the global `$` and augments it with plugins.
-require('/jquery');
-require('/farbtastic');
-require('/excanvas');
-JSON = require('/json2');
-require('/undo-xpopup');
-require('/prefixfree');
-
-var chat = require('/chat').chat;
-var getCollabClient = require('/collab_client').getCollabClient;
-var padconnectionstatus = require('/pad_connectionstatus').padconnectionstatus;
-var padcookie = require('/pad_cookie').padcookie;
-var paddocbar = require('/pad_docbar').paddocbar;
-var padeditbar = require('/pad_editbar').padeditbar;
-var padeditor = require('/pad_editor').padeditor;
-var padimpexp = require('/pad_impexp').padimpexp;
-var padmodals = require('/pad_modals').padmodals;
-var padsavedrevs = require('/pad_savedrevs').padsavedrevs;
-var paduserlist = require('/pad_userlist').paduserlist;
-var padutils = require('/pad_utils').padutils;
-
-var createCookie = require('/pad_utils').createCookie;
-var readCookie = require('/pad_utils').readCookie;
-var randomString = require('/pad_utils').randomString;
+require('ep_etherpad-lite/static/js/jquery');
+require('ep_etherpad-lite/static/js/farbtastic');
+require('ep_etherpad-lite/static/js/excanvas');
+JSON = require('ep_etherpad-lite/static/js/json2');
+require('ep_etherpad-lite/static/js/undo-xpopup');
+require('ep_etherpad-lite/static/js/prefixfree');
+
+var chat = require('ep_etherpad-lite/static/js/chat').chat;
+var getCollabClient = require('ep_etherpad-lite/static/js/collab_client').getCollabClient;
+var padconnectionstatus = require('ep_etherpad-lite/static/js/pad_connectionstatus').padconnectionstatus;
+var padcookie = require('ep_etherpad-lite/static/js/pad_cookie').padcookie;
+var paddocbar = require('ep_etherpad-lite/static/js/pad_docbar').paddocbar;
+var padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
+var padeditor = require('ep_etherpad-lite/static/js/pad_editor').padeditor;
+var padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
+var padmodals = require('ep_etherpad-lite/static/js/pad_modals').padmodals;
+var padsavedrevs = require('ep_etherpad-lite/static/js/pad_savedrevs').padsavedrevs;
+var paduserlist = require('ep_etherpad-lite/static/js/pad_userlist').paduserlist;
+var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils;
+
+var createCookie = require('ep_etherpad-lite/static/js/pad_utils').createCookie;
+var readCookie = require('ep_etherpad-lite/static/js/pad_utils').readCookie;
+var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
function getParams()
{
diff --git a/src/static/js/pad_connectionstatus.js b/src/static/js/pad_connectionstatus.js
index 1de024e8..cce92127 100644
--- a/src/static/js/pad_connectionstatus.js
+++ b/src/static/js/pad_connectionstatus.js
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-var padmodals = require('/pad_modals').padmodals;
+var padmodals = require('ep_etherpad-lite/static/js/pad_modals').padmodals;
var padconnectionstatus = (function()
{
diff --git a/src/static/js/pad_docbar.js b/src/static/js/pad_docbar.js
index b83bf3bf..a1f1e9f9 100644
--- a/src/static/js/pad_docbar.js
+++ b/src/static/js/pad_docbar.js
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-var padutils = require('/pad_utils').padutils;
+var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils;
var paddocbar = (function()
{
@@ -449,7 +449,7 @@ var paddocbar = (function()
handleResizePage: function()
{
// Side-step circular reference. This should be injected.
- var padsavedrevs = require('/pad_savedrevs').padsavedrevs;
+ var padsavedrevs = require('ep_etherpad-lite/static/js/pad_savedrevs').padsavedrevs;
padsavedrevs.handleResizePage();
},
hideLaterIfNoOtherInteraction: function()
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 8e4ffa3c..cbaa31d6 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -20,9 +20,9 @@
* limitations under the License.
*/
-var padutils = require('/pad_utils').padutils;
-var padeditor = require('/pad_editor').padeditor;
-var padsavedrevs = require('/pad_savedrevs').padsavedrevs;
+var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils;
+var padeditor = require('ep_etherpad-lite/static/js/pad_editor').padeditor;
+var padsavedrevs = require('ep_etherpad-lite/static/js/pad_savedrevs').padsavedrevs;
function indexOf(array, value) {
for (var i = 0, ii = array.length; i < ii; i++) {
diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index e838ae04..c3e65e19 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-var padcookie = require('/pad_cookie').padcookie;
-var padutils = require('/pad_utils').padutils;
+var padcookie = require('ep_etherpad-lite/static/js/pad_cookie').padcookie;
+var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils;
var padeditor = (function()
{
@@ -34,7 +34,7 @@ var padeditor = (function()
viewZoom: 100,
init: function(readyFunc, initialViewOptions, _pad)
{
- Ace2Editor = require('/ace').Ace2Editor;
+ Ace2Editor = require('ep_etherpad-lite/static/js/ace').Ace2Editor;
pad = _pad;
settings = pad.settings;
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index 0037195f..4d6a1dfc 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-var paddocbar = require('/pad_docbar').paddocbar;
+var paddocbar = require('ep_etherpad-lite/static/js/pad_docbar').paddocbar;
var padimpexp = (function()
{
diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js
index b78e28f4..c19648a6 100644
--- a/src/static/js/pad_modals.js
+++ b/src/static/js/pad_modals.js
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-var padutils = require('/pad_utils').padutils;
-var paddocbar = require('/pad_docbar').paddocbar;
+var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils;
+var paddocbar = require('ep_etherpad-lite/static/js/pad_docbar').paddocbar;
var padmodals = (function()
{
diff --git a/src/static/js/pad_savedrevs.js b/src/static/js/pad_savedrevs.js
index 6d37dfa8..ae384118 100644
--- a/src/static/js/pad_savedrevs.js
+++ b/src/static/js/pad_savedrevs.js
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-var padutils = require('/pad_utils').padutils;
-var paddocbar = require('/pad_docbar').paddocbar;
+var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils;
+var paddocbar = require('ep_etherpad-lite/static/js/pad_docbar').paddocbar;
var padsavedrevs = (function()
{
diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js
index 2c063d74..1b9d5dca 100644
--- a/src/static/js/pad_userlist.js
+++ b/src/static/js/pad_userlist.js
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-var padutils = require('/pad_utils').padutils;
+var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils;
var myUserInfo = {};
diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js
index fb538211..96b48077 100644
--- a/src/static/js/pad_utils.js
+++ b/src/static/js/pad_utils.js
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-var Security = require('/security');
+var Security = require('ep_etherpad-lite/static/js/security');
/**
* Generates a random String with the given length. Is needed to generate the Author, Group, readonly, session Ids
@@ -75,7 +75,7 @@ var padutils = {
},
uniqueId: function()
{
- var pad = require('/pad').pad; // Sidestep circular dependency
+ var pad = require('ep_etherpad-lite/static/js/pad').pad; // Sidestep circular dependency
function encodeNum(n, width)
{
// returns string that is exactly 'width' chars, padding with zeros
@@ -250,7 +250,7 @@ var padutils = {
},
timediff: function(d)
{
- var pad = require('/pad').pad; // Sidestep circular dependency
+ var pad = require('ep_etherpad-lite/static/js/pad').pad; // Sidestep circular dependency
function format(n, word)
{
n = Math.round(n);
@@ -520,7 +520,7 @@ function setupGlobalExceptionHandler() {
padutils.setupGlobalExceptionHandler = setupGlobalExceptionHandler;
-padutils.binarySearch = require('/ace2_common').binarySearch;
+padutils.binarySearch = require('ep_etherpad-lite/static/js/ace2_common').binarySearch;
exports.randomString = randomString;
exports.createCookie = createCookie;
diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js
index 143ef328..a4f31811 100644
--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@@ -22,13 +22,13 @@
// These jQuery things should create local references, but for now `require()`
// assigns to the global `$` and augments it with plugins.
-require('/jquery');
-JSON = require('/json2');
-require('/undo-xpopup');
+require('ep_etherpad-lite/static/js/jquery');
+JSON = require('ep_etherpad-lite/static/js/json2');
+require('ep_etherpad-lite/static/js/undo-xpopup');
-var createCookie = require('/pad_utils').createCookie;
-var readCookie = require('/pad_utils').readCookie;
-var randomString = require('/pad_utils').randomString;
+var createCookie = require('ep_etherpad-lite/static/js/pad_utils').createCookie;
+var readCookie = require('ep_etherpad-lite/static/js/pad_utils').readCookie;
+var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
var socket, token, padId, export_links;
@@ -127,12 +127,12 @@ function handleClientVars(message)
clientVars = message.data;
//load all script that doesn't work without the clientVars
- BroadcastSlider = require('/broadcast_slider').loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded);
- require('/broadcast_revisions').loadBroadcastRevisionsJS();
- changesetLoader = require('/broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider);
+ BroadcastSlider = require('ep_etherpad-lite/static/js/broadcast_slider').loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded);
+ require('ep_etherpad-lite/static/js/broadcast_revisions').loadBroadcastRevisionsJS();
+ changesetLoader = require('ep_etherpad-lite/static/js/broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider);
//initialize export ui
- require('/pad_impexp').padimpexp.init();
+ require('ep_etherpad-lite/static/js/pad_impexp').padimpexp.init();
//change export urls when the slider moves
var export_rev_regex = /(\/\d+)?\/export/
diff --git a/src/static/js/undomodule.js b/src/static/js/undomodule.js
index 886cbdf0..e30748e2 100644
--- a/src/static/js/undomodule.js
+++ b/src/static/js/undomodule.js
@@ -20,8 +20,8 @@
* limitations under the License.
*/
-var Changeset = require('/Changeset');
-var extend = require('/ace2_common').extend;
+var Changeset = require('ep_etherpad-lite/static/js/Changeset');
+var extend = require('ep_etherpad-lite/static/js/ace2_common').extend;
var undoModule = (function()
{
diff --git a/src/static/pad.html b/src/static/pad.html
index 710b0f01..5019391d 100644
--- a/src/static/pad.html
+++ b/src/static/pad.html
@@ -298,13 +298,13 @@
(function () {
require.setRootURI("../minified/");
require.setGlobalKeyPath("require");
- require('/pad').init();
+ require('ep_etherpad-lite/static/js/pad').init();
/* TODO: These globals shouldn't exist. */
- pad = require('/pad').pad;
- chat = require('/chat').chat;
- padeditbar = require('/pad_editbar').padeditbar;
- padimpexp = require('/pad_impexp').padimpexp;
+ pad = require('ep_etherpad-lite/static/js/pad').pad;
+ chat = require('ep_etherpad-lite/static/js/chat').chat;
+ padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
+ padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
}());
</script>
diff --git a/src/static/timeslider.html b/src/static/timeslider.html
index 579e26ef..b47f6c1d 100644
--- a/src/static/timeslider.html
+++ b/src/static/timeslider.html
@@ -206,11 +206,11 @@
(function () {
require.setRootURI("../minified/");
require.setGlobalKeyPath("require");
- require('/timeslider').init();
+ require('ep_etherpad-lite/static/js/timeslider').init();
/* TODO: These globals shouldn't exist. */
- padeditbar = require('/pad_editbar').padeditbar;
- padimpexp = require('/pad_impexp').padimpexp;
+ padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
+ padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
})();
</script>
</body>