mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-18 12:14:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

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

8
src/static/js/pad_utils.js
View file

@ -20,7 +20,7 @@
* limitations under the License.
*/
var Security = require('ep_etherpad-lite/static/js/security');
var Security = require('./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('ep_etherpad-lite/static/js/pad').pad; // Sidestep circular dependency
var pad = require('./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('ep_etherpad-lite/static/js/pad').pad; // Sidestep circular dependency
var pad = require('./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('ep_etherpad-lite/static/js/ace2_common').binarySearch;
padutils.binarySearch = require('./ace2_common').binarySearch;
exports.randomString = randomString;
exports.createCookie = createCookie;