mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-21 07:56:16 -04:00
Modules requires use relative paths.
This commit is contained in:
parent
6fd73ecfda
commit
6af869cadd
23 changed files with 86 additions and 87 deletions
|
@ -25,7 +25,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var AttributePoolFactory = require("/AttributePoolFactory");
|
var AttributePoolFactory = require("./AttributePoolFactory");
|
||||||
|
|
||||||
var _opt = null;
|
var _opt = null;
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ Ace2Editor.registry = {
|
||||||
nextId: 1
|
nextId: 1
|
||||||
};
|
};
|
||||||
|
|
||||||
var plugins = require('/plugins').plugins;
|
var plugins = require('./plugins').plugins;
|
||||||
|
|
||||||
function Ace2Editor()
|
function Ace2Editor()
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var Security = require('/security');
|
var Security = require('./security');
|
||||||
|
|
||||||
function isNodeText(node)
|
function isNodeText(node)
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var Ace2Common = require('/ace2_common');
|
var Ace2Common = require('./ace2_common');
|
||||||
|
|
||||||
// Extract useful method defined in the other module.
|
// Extract useful method defined in the other module.
|
||||||
var isNodeText = Ace2Common.isNodeText;
|
var isNodeText = Ace2Common.isNodeText;
|
||||||
|
@ -38,18 +38,17 @@ var htmlPrettyEscape = Ace2Common.htmlPrettyEscape;
|
||||||
var map = Ace2Common.map;
|
var map = Ace2Common.map;
|
||||||
var noop = Ace2Common.noop;
|
var noop = Ace2Common.noop;
|
||||||
|
|
||||||
var makeChangesetTracker = require('/changesettracker').makeChangesetTracker;
|
var makeChangesetTracker = require('./changesettracker').makeChangesetTracker;
|
||||||
var colorutils = require('/colorutils').colorutils;
|
var colorutils = require('./colorutils').colorutils;
|
||||||
var makeContentCollector = require('/contentcollector').makeContentCollector;
|
var makeContentCollector = require('./contentcollector').makeContentCollector;
|
||||||
var makeCSSManager = require('/cssmanager').makeCSSManager;
|
var makeCSSManager = require('./cssmanager').makeCSSManager;
|
||||||
var domline = require('/domline').domline;
|
var domline = require('./domline').domline;
|
||||||
var AttribPool = require('/AttributePoolFactory').createAttributePool;
|
var AttribPool = require('./AttributePoolFactory').createAttributePool;
|
||||||
var Changeset = require('/Changeset');
|
var Changeset = require('./Changeset');
|
||||||
var linestylefilter = require('/linestylefilter').linestylefilter;
|
var linestylefilter = require('./linestylefilter').linestylefilter;
|
||||||
var newSkipList = require('/skiplist').newSkipList;
|
var newSkipList = require('./skiplist').newSkipList;
|
||||||
var undoModule = require('/undomodule').undoModule;
|
var undoModule = require('./undomodule').undoModule;
|
||||||
var makeVirtualLineView = require('/virtual_lines').makeVirtualLineView;
|
var makeVirtualLineView = require('./virtual_lines').makeVirtualLineView;
|
||||||
|
|
||||||
|
|
||||||
function Ace2Inner(){
|
function Ace2Inner(){
|
||||||
var DEBUG = false; //$$ build script replaces the string "var DEBUG=true;//$$" with "var DEBUG=false;"
|
var DEBUG = false; //$$ build script replaces the string "var DEBUG=true;//$$" with "var DEBUG=false;"
|
||||||
|
|
|
@ -20,12 +20,12 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var makeCSSManager = require('/cssmanager').makeCSSManager;
|
var makeCSSManager = require('./cssmanager').makeCSSManager;
|
||||||
var domline = require('/domline').domline;
|
var domline = require('./domline').domline;
|
||||||
var AttribPool = require('/AttributePoolFactory').createAttributePool;
|
var AttribPool = require('./AttributePoolFactory').createAttributePool;
|
||||||
var Changeset = require('/Changeset');
|
var Changeset = require('./Changeset');
|
||||||
var linestylefilter = require('/linestylefilter').linestylefilter;
|
var linestylefilter = require('./linestylefilter').linestylefilter;
|
||||||
var colorutils = require('/colorutils').colorutils;
|
var colorutils = require('./colorutils').colorutils;
|
||||||
var Ace2Common = require('./ace2_common');
|
var Ace2Common = require('./ace2_common');
|
||||||
|
|
||||||
var map = Ace2Common.map;
|
var map = Ace2Common.map;
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var AttribPool = require('/AttributePoolFactory').createAttributePool;
|
var AttribPool = require('./AttributePoolFactory').createAttributePool;
|
||||||
var Changeset = require('/Changeset');
|
var Changeset = require('./Changeset');
|
||||||
|
|
||||||
function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
|
function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var padutils = require('/pad_utils').padutils;
|
var padutils = require('./pad_utils').padutils;
|
||||||
var padcookie = require('/pad_cookie').padcookie;
|
var padcookie = require('./pad_cookie').padcookie;
|
||||||
|
|
||||||
var chat = (function()
|
var chat = (function()
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var chat = require('/chat').chat;
|
var chat = require('./chat').chat;
|
||||||
|
|
||||||
// Dependency fill on init. This exists for `pad.socket` only.
|
// Dependency fill on init. This exists for `pad.socket` only.
|
||||||
// TODO: bind directly to the socket.
|
// TODO: bind directly to the socket.
|
||||||
|
|
|
@ -25,8 +25,8 @@
|
||||||
|
|
||||||
var _MAX_LIST_LEVEL = 8;
|
var _MAX_LIST_LEVEL = 8;
|
||||||
|
|
||||||
var Changeset = require('/Changeset');
|
var Changeset = require('./Changeset');
|
||||||
var plugins = require('/plugins').plugins;
|
var plugins = require('./plugins').plugins;
|
||||||
|
|
||||||
function sanitizeUnicode(s)
|
function sanitizeUnicode(s)
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,9 +26,9 @@
|
||||||
// requires: plugins
|
// requires: plugins
|
||||||
// requires: undefined
|
// requires: undefined
|
||||||
|
|
||||||
var Security = require('/security');
|
var Security = require('./security');
|
||||||
var Ace2Common = require('/ace2_common');
|
var Ace2Common = require('./ace2_common');
|
||||||
var plugins = require('/plugins').plugins;
|
var plugins = require('./plugins').plugins;
|
||||||
var map = Ace2Common.map;
|
var map = Ace2Common.map;
|
||||||
var noop = Ace2Common.noop;
|
var noop = Ace2Common.noop;
|
||||||
var identity = Ace2Common.identity;
|
var identity = Ace2Common.identity;
|
||||||
|
|
|
@ -28,9 +28,9 @@
|
||||||
// requires: plugins
|
// requires: plugins
|
||||||
// requires: undefined
|
// requires: undefined
|
||||||
|
|
||||||
var Changeset = require('/Changeset');
|
var Changeset = require('./Changeset');
|
||||||
var plugins = require('/plugins').plugins;
|
var plugins = require('./plugins').plugins;
|
||||||
var map = require('/ace2_common').map;
|
var map = require('./ace2_common').map;
|
||||||
|
|
||||||
var linestylefilter = {};
|
var linestylefilter = {};
|
||||||
|
|
||||||
|
|
|
@ -26,29 +26,29 @@ var socket;
|
||||||
|
|
||||||
// These jQuery things should create local references, but for now `require()`
|
// These jQuery things should create local references, but for now `require()`
|
||||||
// assigns to the global `$` and augments it with plugins.
|
// assigns to the global `$` and augments it with plugins.
|
||||||
require('/jquery');
|
require('./jquery');
|
||||||
require('/farbtastic');
|
require('./farbtastic');
|
||||||
require('/excanvas');
|
require('./excanvas');
|
||||||
JSON = require('/json2');
|
JSON = require('./json2');
|
||||||
require('/undo-xpopup');
|
require('./undo-xpopup');
|
||||||
require('/prefixfree');
|
require('./prefixfree');
|
||||||
|
|
||||||
var chat = require('/chat').chat;
|
var chat = require('./chat').chat;
|
||||||
var getCollabClient = require('/collab_client').getCollabClient;
|
var getCollabClient = require('./collab_client').getCollabClient;
|
||||||
var padconnectionstatus = require('/pad_connectionstatus').padconnectionstatus;
|
var padconnectionstatus = require('./pad_connectionstatus').padconnectionstatus;
|
||||||
var padcookie = require('/pad_cookie').padcookie;
|
var padcookie = require('./pad_cookie').padcookie;
|
||||||
var paddocbar = require('/pad_docbar').paddocbar;
|
var paddocbar = require('./pad_docbar').paddocbar;
|
||||||
var padeditbar = require('/pad_editbar').padeditbar;
|
var padeditbar = require('./pad_editbar').padeditbar;
|
||||||
var padeditor = require('/pad_editor').padeditor;
|
var padeditor = require('./pad_editor').padeditor;
|
||||||
var padimpexp = require('/pad_impexp').padimpexp;
|
var padimpexp = require('./pad_impexp').padimpexp;
|
||||||
var padmodals = require('/pad_modals').padmodals;
|
var padmodals = require('./pad_modals').padmodals;
|
||||||
var padsavedrevs = require('/pad_savedrevs').padsavedrevs;
|
var padsavedrevs = require('./pad_savedrevs').padsavedrevs;
|
||||||
var paduserlist = require('/pad_userlist').paduserlist;
|
var paduserlist = require('./pad_userlist').paduserlist;
|
||||||
var padutils = require('/pad_utils').padutils;
|
var padutils = require('./pad_utils').padutils;
|
||||||
|
|
||||||
var createCookie = require('/pad_utils').createCookie;
|
var createCookie = require('./pad_utils').createCookie;
|
||||||
var readCookie = require('/pad_utils').readCookie;
|
var readCookie = require('./pad_utils').readCookie;
|
||||||
var randomString = require('/pad_utils').randomString;
|
var randomString = require('./pad_utils').randomString;
|
||||||
|
|
||||||
function getParams()
|
function getParams()
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var padmodals = require('/pad_modals').padmodals;
|
var padmodals = require('./pad_modals').padmodals;
|
||||||
|
|
||||||
var padconnectionstatus = (function()
|
var padconnectionstatus = (function()
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var padutils = require('/pad_utils').padutils;
|
var padutils = require('./pad_utils').padutils;
|
||||||
|
|
||||||
var paddocbar = (function()
|
var paddocbar = (function()
|
||||||
{
|
{
|
||||||
|
@ -449,7 +449,7 @@ var paddocbar = (function()
|
||||||
handleResizePage: function()
|
handleResizePage: function()
|
||||||
{
|
{
|
||||||
// Side-step circular reference. This should be injected.
|
// Side-step circular reference. This should be injected.
|
||||||
var padsavedrevs = require('/pad_savedrevs').padsavedrevs;
|
var padsavedrevs = require('./pad_savedrevs').padsavedrevs;
|
||||||
padsavedrevs.handleResizePage();
|
padsavedrevs.handleResizePage();
|
||||||
},
|
},
|
||||||
hideLaterIfNoOtherInteraction: function()
|
hideLaterIfNoOtherInteraction: function()
|
||||||
|
|
|
@ -20,9 +20,9 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var padutils = require('/pad_utils').padutils;
|
var padutils = require('./pad_utils').padutils;
|
||||||
var padeditor = require('/pad_editor').padeditor;
|
var padeditor = require('./pad_editor').padeditor;
|
||||||
var padsavedrevs = require('/pad_savedrevs').padsavedrevs;
|
var padsavedrevs = require('./pad_savedrevs').padsavedrevs;
|
||||||
|
|
||||||
function indexOf(array, value) {
|
function indexOf(array, value) {
|
||||||
for (var i = 0, ii = array.length; i < ii; i++) {
|
for (var i = 0, ii = array.length; i < ii; i++) {
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var padcookie = require('/pad_cookie').padcookie;
|
var padcookie = require('./pad_cookie').padcookie;
|
||||||
var padutils = require('/pad_utils').padutils;
|
var padutils = require('./pad_utils').padutils;
|
||||||
|
|
||||||
var padeditor = (function()
|
var padeditor = (function()
|
||||||
{
|
{
|
||||||
|
@ -34,7 +34,7 @@ var padeditor = (function()
|
||||||
viewZoom: 100,
|
viewZoom: 100,
|
||||||
init: function(readyFunc, initialViewOptions, _pad)
|
init: function(readyFunc, initialViewOptions, _pad)
|
||||||
{
|
{
|
||||||
Ace2Editor = require('/ace').Ace2Editor;
|
Ace2Editor = require('./ace').Ace2Editor;
|
||||||
pad = _pad;
|
pad = _pad;
|
||||||
settings = pad.settings;
|
settings = pad.settings;
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var paddocbar = require('/pad_docbar').paddocbar;
|
var paddocbar = require('./pad_docbar').paddocbar;
|
||||||
|
|
||||||
var padimpexp = (function()
|
var padimpexp = (function()
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var padutils = require('/pad_utils').padutils;
|
var padutils = require('./pad_utils').padutils;
|
||||||
var paddocbar = require('/pad_docbar').paddocbar;
|
var paddocbar = require('./pad_docbar').paddocbar;
|
||||||
|
|
||||||
var padmodals = (function()
|
var padmodals = (function()
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var padutils = require('/pad_utils').padutils;
|
var padutils = require('./pad_utils').padutils;
|
||||||
var paddocbar = require('/pad_docbar').paddocbar;
|
var paddocbar = require('./pad_docbar').paddocbar;
|
||||||
|
|
||||||
var padsavedrevs = (function()
|
var padsavedrevs = (function()
|
||||||
{
|
{
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var padutils = require('/pad_utils').padutils;
|
var padutils = require('./pad_utils').padutils;
|
||||||
|
|
||||||
var myUserInfo = {};
|
var myUserInfo = {};
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var Security = require('/security');
|
var Security = require('./security');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates a random String with the given length. Is needed to generate the Author, Group, readonly, session Ids
|
* 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()
|
uniqueId: function()
|
||||||
{
|
{
|
||||||
var pad = require('/pad').pad; // Sidestep circular dependency
|
var pad = require('./pad').pad; // Sidestep circular dependency
|
||||||
function encodeNum(n, width)
|
function encodeNum(n, width)
|
||||||
{
|
{
|
||||||
// returns string that is exactly 'width' chars, padding with zeros
|
// returns string that is exactly 'width' chars, padding with zeros
|
||||||
|
@ -250,7 +250,7 @@ var padutils = {
|
||||||
},
|
},
|
||||||
timediff: function(d)
|
timediff: function(d)
|
||||||
{
|
{
|
||||||
var pad = require('/pad').pad; // Sidestep circular dependency
|
var pad = require('./pad').pad; // Sidestep circular dependency
|
||||||
function format(n, word)
|
function format(n, word)
|
||||||
{
|
{
|
||||||
n = Math.round(n);
|
n = Math.round(n);
|
||||||
|
@ -520,7 +520,7 @@ function setupGlobalExceptionHandler() {
|
||||||
|
|
||||||
padutils.setupGlobalExceptionHandler = setupGlobalExceptionHandler;
|
padutils.setupGlobalExceptionHandler = setupGlobalExceptionHandler;
|
||||||
|
|
||||||
padutils.binarySearch = require('/ace2_common').binarySearch;
|
padutils.binarySearch = require('./ace2_common').binarySearch;
|
||||||
|
|
||||||
exports.randomString = randomString;
|
exports.randomString = randomString;
|
||||||
exports.createCookie = createCookie;
|
exports.createCookie = createCookie;
|
||||||
|
|
|
@ -22,13 +22,13 @@
|
||||||
|
|
||||||
// These jQuery things should create local references, but for now `require()`
|
// These jQuery things should create local references, but for now `require()`
|
||||||
// assigns to the global `$` and augments it with plugins.
|
// assigns to the global `$` and augments it with plugins.
|
||||||
require('/jquery');
|
require('./jquery');
|
||||||
JSON = require('/json2');
|
JSON = require('./json2');
|
||||||
require('/undo-xpopup');
|
require('./undo-xpopup');
|
||||||
|
|
||||||
var createCookie = require('/pad_utils').createCookie;
|
var createCookie = require('./pad_utils').createCookie;
|
||||||
var readCookie = require('/pad_utils').readCookie;
|
var readCookie = require('./pad_utils').readCookie;
|
||||||
var randomString = require('/pad_utils').randomString;
|
var randomString = require('./pad_utils').randomString;
|
||||||
|
|
||||||
var socket, token, padId, export_links;
|
var socket, token, padId, export_links;
|
||||||
|
|
||||||
|
@ -127,12 +127,12 @@ function handleClientVars(message)
|
||||||
clientVars = message.data;
|
clientVars = message.data;
|
||||||
|
|
||||||
//load all script that doesn't work without the clientVars
|
//load all script that doesn't work without the clientVars
|
||||||
BroadcastSlider = require('/broadcast_slider').loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded);
|
BroadcastSlider = require('./broadcast_slider').loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded);
|
||||||
require('/broadcast_revisions').loadBroadcastRevisionsJS();
|
require('./broadcast_revisions').loadBroadcastRevisionsJS();
|
||||||
changesetLoader = require('/broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider);
|
changesetLoader = require('./broadcast').loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider);
|
||||||
|
|
||||||
//initialize export ui
|
//initialize export ui
|
||||||
require('/pad_impexp').padimpexp.init();
|
require('./pad_impexp').padimpexp.init();
|
||||||
|
|
||||||
//change export urls when the slider moves
|
//change export urls when the slider moves
|
||||||
var export_rev_regex = /(\/\d+)?\/export/
|
var export_rev_regex = /(\/\d+)?\/export/
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var Changeset = require('/Changeset');
|
var Changeset = require('./Changeset');
|
||||||
var extend = require('/ace2_common').extend;
|
var extend = require('./ace2_common').extend;
|
||||||
|
|
||||||
var undoModule = (function()
|
var undoModule = (function()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue