added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670

This commit is contained in:
Matthias Bartelmeß 2012-04-25 10:23:58 +02:00
parent d554420f57
commit 513deef768
5 changed files with 33 additions and 16 deletions

View file

@ -279,13 +279,19 @@
document.domain = document.domain;
var clientVars = {};
(function () {
require.setRootURI("../javascripts/src");
require.setLibraryURI("../javascripts/lib");
var baseURL = '../';
require.setRootURI(baseURL + "javascripts/src");
require.setLibraryURI(baseURL + "javascripts/lib");
require.setGlobalKeyPath("require");
var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
plugins.baseURL = baseURL;
plugins.update(function () {
require('ep_etherpad-lite/static/js/pad').init();
var pad = require('ep_etherpad-lite/static/js/pad');
pad.baseURL = baseURL;
pad.init();
});
/* TODO: These globals shouldn't exist. */