mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'require-paths' into plugin

Browse source 
Conflicts:
	node/server.js
	src/static/js/Changeset.js
	src/static/js/ace.js
	src/static/js/ace2_common.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/changesettracker.js
	src/static/js/chat.js
	src/static/js/collab_client.js
	src/static/js/contentcollector.js
	src/static/js/domline.js
	src/static/js/linestylefilter.js
	src/static/js/pad.js
	src/static/js/pad_connectionstatus.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_editor.js
	src/static/js/pad_impexp.js
	src/static/js/pad_modals.js
	src/static/js/pad_savedrevs.js
	src/static/js/pad_userlist.js
	src/static/js/pad_utils.js
	src/static/js/timeslider.js
	src/static/js/undomodule.js
	src/static/pad.html
	src/static/timeslider.html
This commit is contained in:
Chad Weider 2012-03-10 15:08:09 -08:00
commit ddda347f7a
24 changed files with 93 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/static/js/timeslider.js
View file

@ -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('ep_etherpad-lite/static/js/jquery');
JSON = require('ep_etherpad-lite/static/js/json2');
require('ep_etherpad-lite/static/js/undo-xpopup');
require('./jquery');
JSON = require('./json2');
require('./undo-xpopup');
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 createCookie = require('./pad_utils').createCookie;
var readCookie = require('./pad_utils').readCookie;
var randomString = require('./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('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);
BroadcastSlider = require('./broadcast_slider').loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded);
require('./broadcast_revisions').loadBroadcastRevisionsJS();
changesetLoader = require('./broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider);
//initialize export ui
require('ep_etherpad-lite/static/js/pad_impexp').padimpexp.init();
require('./pad_impexp').padimpexp.init();
//change export urls when the slider moves
var export_rev_regex = /(\/\d+)?\/export/