mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-31 19:02:59 +01:00
speed up timeslider loading
This commit is contained in:
parent
0f4ddf63b6
commit
a0d3c55e17
2 changed files with 11 additions and 36 deletions
|
@ -27,7 +27,6 @@
|
||||||
, "timeslider.js": [
|
, "timeslider.js": [
|
||||||
"timeslider.js"
|
"timeslider.js"
|
||||||
, "colorutils.js"
|
, "colorutils.js"
|
||||||
, "draggable.js"
|
|
||||||
, "pad_utils.js"
|
, "pad_utils.js"
|
||||||
, "$js-cookie/src/js.cookie.js"
|
, "$js-cookie/src/js.cookie.js"
|
||||||
, "browser.js"
|
, "browser.js"
|
||||||
|
@ -50,42 +49,16 @@
|
||||||
, "broadcast_slider.js"
|
, "broadcast_slider.js"
|
||||||
, "broadcast_revisions.js"
|
, "broadcast_revisions.js"
|
||||||
, "socketio.js"
|
, "socketio.js"
|
||||||
]
|
|
||||||
, "ace2_inner.js": [
|
|
||||||
"ace2_inner.js"
|
|
||||||
, "browser.js"
|
|
||||||
, "AttributePool.js"
|
|
||||||
, "Changeset.js"
|
|
||||||
, "ChangesetUtils.js"
|
|
||||||
, "skiplist.js"
|
|
||||||
, "cssmanager.js"
|
|
||||||
, "colorutils.js"
|
|
||||||
, "undomodule.js"
|
|
||||||
, "$unorm/lib/unorm.js"
|
|
||||||
, "contentcollector.js"
|
|
||||||
, "changesettracker.js"
|
|
||||||
, "linestylefilter.js"
|
|
||||||
, "domline.js"
|
|
||||||
, "AttributeManager.js"
|
|
||||||
, "scroll.js"
|
|
||||||
, "caretPosition.js"
|
|
||||||
, "pad_utils.js"
|
|
||||||
, "$js-cookie/src/js.cookie.js"
|
|
||||||
]
|
|
||||||
, "ace2_common.js": [
|
|
||||||
"ace2_common.js"
|
|
||||||
, "browser.js"
|
|
||||||
, "jquery.js"
|
|
||||||
, "rjquery.js"
|
, "rjquery.js"
|
||||||
, "$async.js"
|
, "jquery.js"
|
||||||
, "underscore.js"
|
|
||||||
, "$underscore.js"
|
|
||||||
, "$underscore/underscore.js"
|
|
||||||
, "security.js"
|
|
||||||
, "$security.js"
|
|
||||||
, "pluginfw/client_plugins.js"
|
, "pluginfw/client_plugins.js"
|
||||||
, "pluginfw/plugin_defs.js"
|
|
||||||
, "pluginfw/shared.js"
|
, "pluginfw/shared.js"
|
||||||
|
, "pluginfw/plugin_defs.js"
|
||||||
, "pluginfw/hooks.js"
|
, "pluginfw/hooks.js"
|
||||||
|
, "$security.js"
|
||||||
|
, "security.js"
|
||||||
|
, "ace2_common.js"
|
||||||
|
, "underscore.js"
|
||||||
|
, "$underscore/underscore.js"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -264,16 +264,18 @@
|
||||||
// Strip 'p', the padname and 'timeslider' from the pathname and set as baseURL
|
// Strip 'p', the padname and 'timeslider' from the pathname and set as baseURL
|
||||||
var baseURL = pathComponents.slice(0,pathComponents.length-3).join('/') + '/';
|
var baseURL = pathComponents.slice(0,pathComponents.length-3).join('/') + '/';
|
||||||
|
|
||||||
|
|
||||||
require.setRootURI(baseURL + "javascripts/src");
|
require.setRootURI(baseURL + "javascripts/src");
|
||||||
require.setLibraryURI(baseURL + "javascripts/lib");
|
require.setLibraryURI(baseURL + "javascripts/lib");
|
||||||
require.setGlobalKeyPath("require");
|
require.setGlobalKeyPath("require");
|
||||||
|
|
||||||
|
// this is intentionally moved here so that timeslider, which is a package that contains
|
||||||
|
// most of the code needed for timeslider functionality, is loaded first.
|
||||||
|
var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
|
||||||
|
|
||||||
$ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
|
$ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
|
||||||
browser = require('ep_etherpad-lite/static/js/browser');
|
browser = require('ep_etherpad-lite/static/js/browser');
|
||||||
|
|
||||||
var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
|
var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
|
||||||
var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
|
|
||||||
BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
|
BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
|
||||||
plugins.baseURL = baseURL;
|
plugins.baseURL = baseURL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue