diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index dc31895a4..4874432b1 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -146,14 +146,6 @@ const minify = async (req, res) => { filename = 'js/vendors/jquery.js'; } - // Backward compatibility for plugins that were written when underscore lived at - // src/static/js/underscore.js. - if (['js/underscore.js', 'plugins/ep_etherpad-lite/static/js/underscore.js'] - .indexOf(filename) !== -1) { - logger.warn(`request for deprecated underscore path: ${filename}`); - filename = 'js/vendors/underscore.js'; - } - /* Handle static files for plugins/libraries: paths like "plugins/ep_myplugin/static/js/test.js" are rewritten into ROOT_PATH_OF_MYPLUGIN/static/js/test.js, diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json index ad85664ae..07e9a7ab2 100644 --- a/src/node/utils/tar.json +++ b/src/node/utils/tar.json @@ -72,7 +72,7 @@ , "vendors/jquery.js" , "rjquery.js" , "$async.js" - , "vendors/underscore.js" + , "underscore.js" , "$underscore.js" , "$underscore/underscore.js" , "security.js" @@ -82,6 +82,4 @@ , "pluginfw/shared.js" , "pluginfw/hooks.js" ] -, "jquery.js": ["jquery.js"] -, "underscore.js": ["underscore.js"] } diff --git a/src/static/js/AttributeManager.js b/src/static/js/AttributeManager.js index 6cda86c48..c89fc410f 100644 --- a/src/static/js/AttributeManager.js +++ b/src/static/js/AttributeManager.js @@ -2,7 +2,7 @@ const Changeset = require('./Changeset'); const ChangesetUtils = require('./ChangesetUtils'); -const _ = require('./vendors/underscore'); +const _ = require('./underscore'); const lineMarkerAttribute = 'lmkr'; diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js index 871e8c9bd..26370f6b5 100644 --- a/src/static/js/broadcast.js +++ b/src/static/js/broadcast.js @@ -28,7 +28,7 @@ const AttribPool = require('./AttributePool'); const Changeset = require('./Changeset'); const linestylefilter = require('./linestylefilter').linestylefilter; const colorutils = require('./colorutils').colorutils; -const _ = require('./vendors/underscore'); +const _ = require('./underscore'); const hooks = require('./pluginfw/hooks'); // These parameters were global, now they are injected. A reference to the diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js index 816a67a20..f03a22836 100644 --- a/src/static/js/broadcast_slider.js +++ b/src/static/js/broadcast_slider.js @@ -23,7 +23,7 @@ // These parameters were global, now they are injected. A reference to the // Timeslider controller would probably be more appropriate. -const _ = require('./vendors/underscore'); +const _ = require('./underscore'); const padmodals = require('./pad_modals').padmodals; const colorutils = require('./colorutils').colorutils; diff --git a/src/static/js/domline.js b/src/static/js/domline.js index 727d81ed5..324e13535 100644 --- a/src/static/js/domline.js +++ b/src/static/js/domline.js @@ -24,7 +24,7 @@ const Security = require('./security'); const hooks = require('./pluginfw/hooks'); -const _ = require('./vendors/underscore'); +const _ = require('./underscore'); const lineAttributeMarker = require('./linestylefilter').lineAttributeMarker; const noop = () => {}; diff --git a/src/static/js/skiplist.js b/src/static/js/skiplist.js index 006cf0086..4ea740104 100644 --- a/src/static/js/skiplist.js +++ b/src/static/js/skiplist.js @@ -23,7 +23,7 @@ */ const Ace2Common = require('./ace2_common'); -const _ = require('./vendors/underscore'); +const _ = require('./underscore'); const noop = Ace2Common.noop; diff --git a/src/static/js/vendors/underscore.js b/src/static/js/underscore.js similarity index 100% rename from src/static/js/vendors/underscore.js rename to src/static/js/underscore.js diff --git a/src/static/js/undomodule.js b/src/static/js/undomodule.js index 294b23bb7..b8270b805 100644 --- a/src/static/js/undomodule.js +++ b/src/static/js/undomodule.js @@ -23,7 +23,7 @@ */ const Changeset = require('./Changeset'); -const _ = require('./vendors/underscore'); +const _ = require('./underscore'); const undoModule = (() => { const stack = (() => {